mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-20 07:53:51 +00:00
OpenCS: add a mask for particle systems
This commit is contained in:
parent
ad2145b463
commit
e7bb8878f3
2 changed files with 6 additions and 1 deletions
|
@ -17,6 +17,9 @@ namespace CSVRender
|
||||||
Mask_Fog = 0x10,
|
Mask_Fog = 0x10,
|
||||||
Mask_Terrain = 0x20,
|
Mask_Terrain = 0x20,
|
||||||
|
|
||||||
|
// used within models
|
||||||
|
Mask_ParticleSystem = 0x100,
|
||||||
|
|
||||||
// control elements
|
// control elements
|
||||||
Mask_CellMarker = 0x10000,
|
Mask_CellMarker = 0x10000,
|
||||||
Mask_CellArrow = 0x20000,
|
Mask_CellArrow = 0x20000,
|
||||||
|
|
|
@ -93,7 +93,7 @@ void RenderWidget::flagAsModified()
|
||||||
|
|
||||||
void RenderWidget::setVisibilityMask(int mask)
|
void RenderWidget::setVisibilityMask(int mask)
|
||||||
{
|
{
|
||||||
mView->getCamera()->setCullMask(mask);
|
mView->getCamera()->setCullMask(mask | Mask_ParticleSystem);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
|
bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
|
||||||
|
@ -167,6 +167,8 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
|
||||||
|
|
||||||
setLighting(&mLightingDay);
|
setLighting(&mLightingDay);
|
||||||
|
|
||||||
|
mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
|
||||||
|
|
||||||
/// \todo make shortcut configurable
|
/// \todo make shortcut configurable
|
||||||
QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
|
QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
|
||||||
connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));
|
connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));
|
||||||
|
|
Loading…
Reference in a new issue