Fixed modal screen flicker, removed remainders of the old focus code, tidied vc8 project
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1003 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
429220dace
commit
31afde9563
|
@ -273,13 +273,6 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
|
|||
openCloseMenu();
|
||||
return true;
|
||||
}
|
||||
|
||||
// TODO: This is dead code
|
||||
if (!AbsoluteClippingRect.isPointInside(p))
|
||||
{
|
||||
Environment->removeFocus(this);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case EMIE_MOUSE_WHEEL:
|
||||
|
|
|
@ -60,6 +60,7 @@ bool CGUIModalScreen::OnEvent(const SEvent& event)
|
|||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
|
||||
{
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include "CSceneManager.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "IFileSystem.h"
|
||||
#include "IAnimatedMesh.h"
|
||||
#include "SAnimatedMesh.h"
|
||||
#include "CMeshCache.h"
|
||||
#include "IWriteFile.h"
|
||||
#include "IXMLWriter.h"
|
||||
|
|
|
@ -559,34 +559,6 @@
|
|||
<Filter
|
||||
Name="scene"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleAttractionAffector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleCylinderEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleMeshEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleRingEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleRotationAffector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleSphereEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\ECullingTypes.h"
|
||||
>
|
||||
|
@ -595,6 +567,10 @@
|
|||
RelativePath="..\..\include\EDebugSceneTypes.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\EMeshWriterEnums.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\..\include\ESceneNodeAnimatorTypes.h"
|
||||
>
|
||||
|
@ -663,10 +639,6 @@
|
|||
RelativePath="..\..\include\IMeshWriter.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\EMeshWriterEnums.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\..\include\IMetaTriangleSelector.h"
|
||||
>
|
||||
|
@ -1855,14 +1827,6 @@
|
|||
RelativePath=".\CSkinnedMesh.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CXMeshFileLoader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CXMeshFileLoader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CSTLMeshFileLoader.cpp"
|
||||
>
|
||||
|
@ -1871,6 +1835,14 @@
|
|||
RelativePath="CSTLMeshFileLoader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CXMeshFileLoader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CXMeshFileLoader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\dmfsupport.h"
|
||||
>
|
||||
|
@ -2043,6 +2015,14 @@
|
|||
<Filter
|
||||
Name="particleSystem"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleAttractionAffector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CParticleBoxEmitter.cpp"
|
||||
>
|
||||
|
@ -2051,6 +2031,10 @@
|
|||
RelativePath="CParticleBoxEmitter.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleCylinderEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CParticleFadeOutAffector.cpp"
|
||||
>
|
||||
|
@ -2067,6 +2051,10 @@
|
|||
RelativePath="CParticleGravityAffector.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleMeshEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CParticlePointEmitter.cpp"
|
||||
>
|
||||
|
@ -2075,6 +2063,18 @@
|
|||
RelativePath="CParticlePointEmitter.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleRingEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleRotationAffector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CParticleSphereEmitter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="CParticleSystemSceneNode.cpp"
|
||||
>
|
||||
|
|
Loading…
Reference in New Issue