Added IrrCompileConfig define to compile without GUI.
Fixed a couple of spelling mistakes. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@809 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
cdd017da43
commit
4e4c393d41
|
@ -59,6 +59,11 @@ Changes in version 1.4 (... 2007)
|
|||
|
||||
GUI:
|
||||
|
||||
- Added _IRR_COMPILE_WITH_GUI_ to allow compiling without the GUI.
|
||||
This is useful if you use another GUI system (ie CEGUI) or are using Irrlicht
|
||||
inside another window. You will have to supply an external IGUIFont if you wish
|
||||
to use font scene nodes as there will be no GUI environment available to load fonts.
|
||||
|
||||
- Added 7 more symbols to the built-in font and skin.
|
||||
EGDI_MORE_LEFT, EGDI_MORE_RIGHT, EGDI_MORE_UP, EGDI_MORE_DOWN: "<<" symbols
|
||||
indicating there is more content in that direction.
|
||||
|
|
|
@ -12,7 +12,7 @@ namespace irr
|
|||
{
|
||||
namespace scene
|
||||
{
|
||||
//! Interface for a Mesh wich can be loaded directly from a Quake3 .bsp-file.
|
||||
//! Interface for a Mesh which can be loaded directly from a Quake3 .bsp-file.
|
||||
/** The Mesh tries to load all textures of the map. There are currently
|
||||
no additional methods in this class, but maybe there will be some in later
|
||||
releases if there are feature requests. */
|
||||
|
|
|
@ -45,7 +45,7 @@ namespace scene
|
|||
//! \param radius: New radius of the ellipsoid.
|
||||
virtual void setEllipsoidRadius(const core::vector3df& radius) = 0;
|
||||
|
||||
//! Returns the radius of the ellipsoid with wich the collision detection and
|
||||
//! Returns the radius of the ellipsoid with which the collision detection and
|
||||
//! response is done.
|
||||
//! \return Radius of the ellipsoid.
|
||||
virtual core::vector3df getEllipsoidRadius() const = 0;
|
||||
|
|
|
@ -103,6 +103,10 @@ define out. */
|
|||
//#define _IRR_LINUX_X11_RANDR_
|
||||
#endif
|
||||
|
||||
//! Define _IRR_COMPILE_WITH_GUI_ to compile the engine with the built-in GUI
|
||||
/** Disable this if you are using an external library to draw the GUI. If you disable this then
|
||||
you will not be able to use anything provided by the GUI Environment, including loading fonts. */
|
||||
#define _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
//! Define _IRR_COMPILE_WITH_ZLIB_ to enable compiling the engine using zlib.
|
||||
/** This enables the engine to read from compressed .zip archives. If you
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __BUILD_IN_FONT_H_INCLUDED__
|
||||
#define __BUILD_IN_FONT_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
// headerfile generated by Bin2H, copyright 2002 by N.Gebhardt.
|
||||
// Bin2H is Freeware. Download it freely from www.code3d.com.
|
||||
// for the source bitmap, see builtInFont.bmp
|
||||
|
@ -1056,6 +1059,7 @@ u8 BuiltInFontData[] =
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CDefaultGUIElementFactory.h"
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIButton.h"
|
||||
#include "IGUICheckBox.h"
|
||||
|
@ -153,3 +156,4 @@ EGUI_ELEMENT_TYPE CDefaultGUIElementFactory::getTypeFromName(const c8* name)
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__
|
||||
#define __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIElementFactory.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -62,5 +65,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_DEFAULT_GUI_ELEMENT_FACTORY_H_INCLUDED__
|
||||
|
|
|
@ -31,6 +31,11 @@ namespace io
|
|||
|
||||
CFileList::CFileList()
|
||||
{
|
||||
|
||||
#ifdef _DEBUG
|
||||
setDebugName("CFileList");
|
||||
#endif
|
||||
|
||||
// --------------------------------------------
|
||||
// Windows version
|
||||
#ifdef _IRR_WINDOWS_API_
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIButton.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -461,3 +463,5 @@ void CGUIButton::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWr
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_BUTTON_H_INCLUDED__
|
||||
#define __C_GUI_BUTTON_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIButton.h"
|
||||
#include "IGUISpriteBank.h"
|
||||
#include "SColor.h"
|
||||
|
@ -124,5 +127,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_BUTTON_H_INCLUDED__
|
||||
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUICheckBox.h"
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -196,3 +199,5 @@ void CGUICheckBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRead
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_CHECKBOX_H_INCLUDED__
|
||||
#define __C_GUI_CHECKBOX_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUICheckBox.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -50,5 +53,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // __C_GUI_CHECKBOX_H_INCLUDED__
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIColorSelectDialog.h"
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -482,3 +485,5 @@ void CGUIColorSelectDialog::sendCancelEvent()
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
|
||||
#define __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIColorSelectDialog.h"
|
||||
#include "IGUIButton.h"
|
||||
#include "IGUIEditBox.h"
|
||||
|
@ -72,5 +75,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
|
||||
|
|
|
@ -2,9 +2,11 @@
|
|||
// This file is part of the "Irrlicht Engine".
|
||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIComboBox.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "CGUIComboBox.h"
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIFont.h"
|
||||
|
@ -431,3 +433,5 @@ void CGUIComboBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRead
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_COMBO_BOX_H_INCLUDED__
|
||||
#define __C_GUI_COMBO_BOX_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIComboBox.h"
|
||||
#include "irrString.h"
|
||||
#include "irrArray.h"
|
||||
|
@ -13,6 +16,9 @@ namespace irr
|
|||
{
|
||||
namespace gui
|
||||
{
|
||||
class IGUIButton;
|
||||
class IGUIListBox;
|
||||
|
||||
//! Single line edit box for editing simple text.
|
||||
class CGUIComboBox : public IGUIComboBox
|
||||
{
|
||||
|
@ -81,5 +87,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_COMBO_BOX_H_INCLUDED__
|
||||
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIContextMenu.h"
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -690,3 +693,5 @@ void CGUIContextMenu::setEventParent(IGUIElement *parent)
|
|||
} // end namespace
|
||||
} // end namespace
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_CONTEXT_MENU_H_INCLUDED__
|
||||
#define __C_GUI_CONTEXT_MENU_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIContextMenu.h"
|
||||
#include "irrString.h"
|
||||
#include "irrArray.h"
|
||||
|
@ -137,5 +140,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_CONTEXT_MENU_H_INCLUDED__
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIEditBox.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIFont.h"
|
||||
|
@ -1282,3 +1284,4 @@ void CGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadW
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_EDIT_BOX_H_INCLUDED__
|
||||
#define __C_GUI_EDIT_BOX_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEditBox.h"
|
||||
#include "irrArray.h"
|
||||
#include "IOSOperator.h"
|
||||
|
@ -138,5 +141,5 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
#endif // __C_GUI_EDIT_BOX_H_INCLUDED__
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIEnvironment.h"
|
||||
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IVideoDriver.h"
|
||||
|
||||
#include "CGUISkin.h"
|
||||
|
@ -1494,3 +1497,4 @@ IGUIEnvironment* createGUIEnvironment(io::IFileSystem* fs, video::IVideoDriver*
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_ENVIRNMENT_H_INCLUDED__
|
||||
#define __C_GUI_ENVIRNMENT_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIElement.h"
|
||||
#include "irrArray.h"
|
||||
|
@ -281,5 +284,7 @@ private:
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_ENVIRNMENT_H_INCLUDED__
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIFileOpenDialog.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -313,3 +315,5 @@ void CGUIFileOpenDialog::sendCancelEvent()
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
|
||||
#define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIFileOpenDialog.h"
|
||||
#include "IGUIButton.h"
|
||||
#include "IGUIListBox.h"
|
||||
|
@ -63,5 +66,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIFont.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "os.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IXMLReader.h"
|
||||
|
@ -636,3 +638,5 @@ IGUISpriteBank* CGUIFont::getSpriteBank()
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_FONT_H_INCLUDED__
|
||||
#define __C_GUI_FONT_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIFontBitmap.h"
|
||||
#include "irrString.h"
|
||||
#include "irrMap.h"
|
||||
|
@ -104,5 +107,7 @@ private:
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_FONT_H_INCLUDED__
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIImage.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -152,3 +154,5 @@ void CGUIImage::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWri
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_IMAGE_H_INCLUDED__
|
||||
#define __C_GUI_IMAGE_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIImage.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -62,5 +65,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_IMAGE_H_INCLUDED__
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIInOutFader.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "os.h"
|
||||
|
@ -181,3 +183,6 @@ void CGUIInOutFader::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_IN_OUT_FADER_H_INCLUDED__
|
||||
#define __C_GUI_IN_OUT_FADER_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIInOutFader.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -70,5 +73,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_IN_OUT_FADER_H_INCLUDED__
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIListBox.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -664,3 +666,5 @@ void CGUIListBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadW
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_LIST_BOX_BAR_H_INCLUDED__
|
||||
#define __C_GUI_LIST_BOX_BAR_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIListBox.h"
|
||||
#include "irrArray.h"
|
||||
|
||||
|
@ -122,5 +125,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIMenu.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -250,3 +252,4 @@ void CGUIMenu::updateAbsolutePosition()
|
|||
} // end namespace
|
||||
} // end namespace
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_MENU_H_INCLUDED__
|
||||
#define __C_GUI_MENU_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "CGUIContextMenu.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -49,5 +52,5 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
|
||||
#endif // __C_GUI_MENU_H_INCLUDED__
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIMeshViewer.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "IAnimatedMesh.h"
|
||||
|
@ -180,4 +182,5 @@ void CGUIMeshViewer::draw()
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_MESH_VIEWER_H_INCLUDED__
|
||||
#define __C_GUI_MESH_VIEWER_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIMeshViewer.h"
|
||||
#include "SMaterial.h"
|
||||
#include "vector3d.h"
|
||||
|
@ -54,5 +57,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIMessageBox.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIButton.h"
|
||||
|
@ -418,3 +420,6 @@ void CGUIMessageBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
|
||||
#endif _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_MESSAGE_BOX_H_INCLUDED__
|
||||
#define __C_GUI_MESSAGE_BOX_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "CGUIWindow.h"
|
||||
#include "IGUIStaticText.h"
|
||||
#include "irrArray.h"
|
||||
|
@ -52,5 +55,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIModalScreen.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "os.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -152,3 +154,4 @@ void CGUIModalScreen::deserializeAttributes(io::IAttributes* in, io::SAttributeR
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_MODAL_SCREEN_H_INCLUDED__
|
||||
#define __C_GUI_MODAL_SCREEN_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIElement.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -53,5 +56,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIScrollBar.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -438,3 +440,4 @@ void CGUIScrollBar::deserializeAttributes(io::IAttributes* in, io::SAttributeRea
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
#ifndef __C_GUI_SCROLL_BAR_H_INCLUDED__
|
||||
#define __C_GUI_SCROLL_BAR_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIScrollBar.h"
|
||||
#include "IGUIButton.h"
|
||||
|
@ -80,5 +82,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUISkin.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIFont.h"
|
||||
#include "IGUISpriteBank.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -829,3 +831,4 @@ void CGUISkin::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWrit
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_SKIN_H_INCLUDED__
|
||||
#define __C_GUI_SKIN_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "irrString.h"
|
||||
|
||||
|
@ -234,5 +237,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
// Copyright (C) 2006 Michael Zeilfelder
|
||||
// This file uses the licence of the Irrlicht Engine.
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#include "CGUISpinBox.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "CGUIEditBox.h"
|
||||
#include "CGUIButton.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
|
@ -247,3 +248,5 @@ void CGUISpinBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadW
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
#ifndef __C_GUI_SPIN_BOX_H_INCLUDED__
|
||||
#define __C_GUI_SPIN_BOX_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISpinBox.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -90,5 +93,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_SPIN_BOX_H_INCLUDED__
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
|
||||
#include "CGUISpriteBank.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "ITexture.h"
|
||||
|
@ -122,3 +124,5 @@ void CGUISpriteBank::draw2DSprite(u32 index, const core::position2di& pos,
|
|||
|
||||
} // namespace gui
|
||||
} // namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -2,6 +2,9 @@
|
|||
#ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__
|
||||
#define __C_GUI_SPRITE_BANK_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISpriteBank.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -52,6 +55,8 @@ protected:
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIStaticText.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIFont.h"
|
||||
|
@ -446,4 +448,4 @@ void CGUIStaticText::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
|
||||
#endif _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__
|
||||
#define __C_GUI_STATIC_TEXT_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIStaticText.h"
|
||||
#include "irrArray.h"
|
||||
|
||||
|
@ -104,6 +107,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUITabControl.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIFont.h"
|
||||
|
@ -488,3 +490,4 @@ void CGUITabControl::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
|
|||
} // end namespace irr
|
||||
} // end namespace gui
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_TAB_CONTROL_H_INCLUDED__
|
||||
#define __C_GUI_TAB_CONTROL_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUITabControl.h"
|
||||
#include "irrArray.h"
|
||||
|
||||
|
@ -126,5 +129,7 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIToolBar.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -157,3 +159,5 @@ IGUIButton* CGUIToolBar::addButton(s32 id, const wchar_t* text,const wchar_t* to
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_TOOL_BAR_H_INCLUDED__
|
||||
#define __C_GUI_TOOL_BAR_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIToolbar.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -46,5 +49,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#include "CGUIWindow.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUISkin.h"
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IVideoDriver.h"
|
||||
|
@ -240,3 +242,5 @@ IGUIButton* CGUIWindow::getMaximizeButton()
|
|||
|
||||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef __C_GUI_WINDOW_H_INCLUDED__
|
||||
#define __C_GUI_WINDOW_H_INCLUDED__
|
||||
|
||||
#include "IrrCompileConfig.h"
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#include "IGUIWindow.h"
|
||||
|
||||
namespace irr
|
||||
|
@ -54,5 +57,6 @@ namespace gui
|
|||
} // end namespace gui
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
#endif // _IRR_COMPILE_WITH_GUI_
|
||||
|
||||
#endif
|
||||
|
|
|
@ -66,8 +66,10 @@ CIrrDeviceStub::~CIrrDeviceStub()
|
|||
|
||||
void CIrrDeviceStub::createGUIAndScene()
|
||||
{
|
||||
#ifdef _IRR_COMPILE_WITH_GUI_
|
||||
// create gui environment
|
||||
GUIEnvironment = gui::createGUIEnvironment(FileSystem, VideoDriver, Operator);
|
||||
#endif
|
||||
|
||||
// create Scene manager
|
||||
SceneManager = scene::createSceneManager(VideoDriver, FileSystem, CursorControl, GUIEnvironment);
|
||||
|
|
|
@ -44,7 +44,7 @@ namespace scene
|
|||
//! response is done.
|
||||
virtual void setEllipsoidRadius(const core::vector3df& radius);
|
||||
|
||||
//! Returns the radius of the ellipsoid with wich the collision detection and
|
||||
//! Returns the radius of the ellipsoid with which the collision detection and
|
||||
//! response is done.
|
||||
virtual core::vector3df getEllipsoidRadius() const;
|
||||
|
||||
|
|
|
@ -865,6 +865,10 @@
|
|||
RelativePath=".\CGUIColorSelectDialog.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CGUIColorSelectDialog.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CGUIComboBox.cpp"
|
||||
>
|
||||
|
|
Loading…
Reference in New Issue