AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for preview scale on billboards, prevent CDoorExtra from drawing its wireframe in game mode, change default World Editor tab to Modify

This commit is contained in:
parax0 2015-12-16 18:20:26 -07:00
parent b4ac78fd62
commit 2faf44821b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Scene/CScriptNode.cpp
View File

@ -488,7 +488,7 @@ CAABox CScriptNode::PreviewVolumeAABox() const
CVector2f CScriptNode::BillboardScale() const CVector2f CScriptNode::BillboardScale() const
{ {
CVector2f out = (mpInstance->Template()->ScaleType() == CScriptTemplate::eScaleEnabled ? AbsoluteScale().xz() : CVector2f(1.f)); CVector2f out = (mpInstance->Template()->ScaleType() == CScriptTemplate::eScaleEnabled ? AbsoluteScale().xz() : CVector2f(1.f));
return out * 0.5f; return out * 0.5f * mScaleMultiplier;
} }
// ************ PROTECTED ************ // ************ PROTECTED ************

2
src/Core/ScriptExtra/CDoorExtra.cpp
View File

@ -49,7 +49,7 @@ void CDoorExtra::AddToRenderer(CRenderer *pRenderer, const SViewInfo& ViewInfo)
else else
pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawMesh); pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawMesh);
if (mpParent->IsSelected()) if (mpParent->IsSelected() && !ViewInfo.GameMode)
pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawSelection); pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawSelection);
} }
} }

2
src/Editor/WorldEditor/CWorldEditor.ui
View File

@ -342,7 +342,7 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>4</number> <number>1</number>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>