zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revision 1599 from 1.4 branch and fixed also the second issue we had with disabled X11 support. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1600 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-09-30 08:57:47 +00:00
parent 8db1da30c2
commit b4c597aa83
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/IVideoDriver.h
View File

@ -980,8 +980,8 @@ namespace video
virtual void setAmbientLight(const SColorf& color) = 0; virtual void setAmbientLight(const SColorf& color) = 0;
//! Only used by the engine internally. //! Only used by the engine internally.
/** Passes the global material flag DisableZWriteOnTransparent. /** Passes the global material flag AllowZWriteOnTransparent.
Use the SceneManager attribute to set this value from the app. Use the SceneManager attribute to set this value from your app.
\param flag Default behavior is to disable ZWrite, i.e. false. */ \param flag Default behavior is to disable ZWrite, i.e. false. */
virtual void setAllowZWriteOnTransparent(bool flag) = 0; virtual void setAllowZWriteOnTransparent(bool flag) = 0;
}; };

4
include/IrrCompileConfig.h
View File

@ -82,7 +82,7 @@ to the compiler settings: -DIRR_COMPILE_WITH_DX9_DEV_PACK
and this to the linker settings: -ld3dx9 -ld3dx8 **/ and this to the linker settings: -ld3dx9 -ld3dx8 **/
#if defined(_IRR_WINDOWS_API_) && (!defined(__GNUC__) || defined(IRR_COMPILE_WITH_DX9_DEV_PACK)) #if defined(_IRR_WINDOWS_API_) && (!defined(__GNUC__) || defined(IRR_COMPILE_WITH_DX9_DEV_PACK))
#define _IRR_COMPILE_WITH_DIRECT3D_8_ //#define _IRR_COMPILE_WITH_DIRECT3D_8_
#define _IRR_COMPILE_WITH_DIRECT3D_9_ #define _IRR_COMPILE_WITH_DIRECT3D_9_
#endif #endif
@ -116,7 +116,7 @@ define out. */
//! On some Linux systems the XF86 vidmode extension or X11 RandR are missing. Use these flags //! On some Linux systems the XF86 vidmode extension or X11 RandR are missing. Use these flags
//! to remove the dependencies such that Irrlicht will compile on those systems, too. //! to remove the dependencies such that Irrlicht will compile on those systems, too.
#if defined(_IRR_LINUX_PLATFORM_) #if defined(_IRR_LINUX_PLATFORM_) && defined(_IRR_COMPILE_WITH_X11_)
#define _IRR_LINUX_X11_VIDMODE_ #define _IRR_LINUX_X11_VIDMODE_
//#define _IRR_LINUX_X11_RANDR_ //#define _IRR_LINUX_X11_RANDR_
#endif #endif

4
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -41,9 +41,9 @@ CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters& param)
: CIrrDeviceStub(param), : CIrrDeviceStub(param),
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
display(0), visual(0), screennr(0), window(0), StdHints(0), SoftwareImage(0), display(0), visual(0), screennr(0), window(0), StdHints(0), SoftwareImage(0),
#endif
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
Context(0), Context(0),
#endif
#endif #endif
Width(param.WindowSize.Width), Height(param.WindowSize.Height), Width(param.WindowSize.Width), Height(param.WindowSize.Height),
Close(false), WindowHasFocus(false), WindowMinimized(false), Close(false), WindowHasFocus(false), WindowMinimized(false),
@ -1012,9 +1012,11 @@ bool CIrrDeviceLinux::isWindowMinimized() const
//! returns color format of the window. //! returns color format of the window.
video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const
{ {
#ifdef _IRR_COMPILE_WITH_X11_
if (visual && (visual->depth != 16)) if (visual && (visual->depth != 16))
return video::ECF_R8G8B8; return video::ECF_R8G8B8;
else else
#endif
return video::ECF_R5G6B5; return video::ECF_R5G6B5;
} }