Merged from other branches up to revision 1527:
LinuxDevice initialiser list fix. WinCE setup parameter handling bug fix. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1528 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
8a070d9cc6
commit
9672dec5f2
|
@ -1,5 +1,8 @@
|
|||
|
||||
Changes in version 1.5 (... 2008)
|
||||
|
||||
- WindowsCE-Bugfix
|
||||
|
||||
- isBetweenPoints return true now even for the begin and end points, i.e. line segments are now including their start and end.
|
||||
|
||||
- Fix XML reader creation for non-existing files and invalid callbacks.
|
||||
|
|
|
@ -104,7 +104,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
|
|||
int main()
|
||||
#endif
|
||||
{
|
||||
E_DRIVER_TYPE driverType = EDT_BURNINGSVIDEO;
|
||||
//E_DRIVER_TYPE driverType = EDT_BURNINGSVIDEO;
|
||||
E_DRIVER_TYPE driverType = EDT_OPENGL;
|
||||
|
||||
// create device
|
||||
|
||||
|
|
|
@ -41,9 +41,14 @@ CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters& param)
|
|||
: CIrrDeviceStub(param),
|
||||
#ifdef _IRR_COMPILE_WITH_X11_
|
||||
display(0), visual(0), screennr(0), window(0), StdHints(0), SoftwareImage(0),
|
||||
#endif
|
||||
#ifdef _IRR_COMPILE_WITH_OPENGL_
|
||||
Context(0),
|
||||
#endif
|
||||
Width(param.WindowSize.Width), Height(param.WindowSize.Height),
|
||||
Close(false), WindowHasFocus(false), WindowMinimized(false), UseXVidMode(false), UseXRandR(false), UseGLXWindow(false), AutorepeatSupport(0)
|
||||
Close(false), WindowHasFocus(false), WindowMinimized(false),
|
||||
UseXVidMode(false), UseXRandR(false), UseGLXWindow(false),
|
||||
AutorepeatSupport(0)
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
setDebugName("CIrrDeviceLinux");
|
||||
|
@ -114,7 +119,6 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
|
|||
glXDestroyContext(display, Context);
|
||||
if (UseGLXWindow)
|
||||
glXDestroyWindow(display, glxWin);
|
||||
Context = 0;
|
||||
}
|
||||
#endif // #ifdef _IRR_COMPILE_WITH_OPENGL_
|
||||
|
||||
|
@ -1158,6 +1162,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
|
|||
if (display && temporaryDisplay)
|
||||
{
|
||||
XCloseDisplay(display);
|
||||
display=0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -678,6 +678,7 @@ bool CIrrDeviceWinCE::isWindowFocused() const
|
|||
//! returns if window is minimized
|
||||
bool CIrrDeviceWinCE::isWindowMinimized() const
|
||||
{
|
||||
#if 0
|
||||
WINDOWPLACEMENT plc;
|
||||
plc.length=sizeof(WINDOWPLACEMENT);
|
||||
bool ret=false;
|
||||
|
@ -685,6 +686,8 @@ bool CIrrDeviceWinCE::isWindowMinimized() const
|
|||
ret=(plc.showCmd & SW_SHOWMINIMIZED);
|
||||
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
|
||||
return ret;
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -26,9 +26,7 @@ namespace irr
|
|||
public:
|
||||
|
||||
//! constructor
|
||||
CIrrDeviceWinCE(
|
||||
core::dimension2d<s32> windowSize,
|
||||
const SIrrlichtCreationParameters& params);
|
||||
CIrrDeviceWinCE( const SIrrlichtCreationParameters& params);
|
||||
|
||||
//! destructor
|
||||
virtual ~CIrrDeviceWinCE();
|
||||
|
|
Loading…
Reference in New Issue