mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-28 20:00:54 +00:00
Changed: #1193 Code cleanup.
This commit is contained in:
parent
ed4f0cca43
commit
15a429a0e4
27 changed files with 105 additions and 88 deletions
|
@ -45,12 +45,12 @@ namespace NLQT
|
|||
|
||||
CAttribWidget::CAttribWidget(QWidget *parent)
|
||||
: QGroupBox(parent),
|
||||
_SrcInputEnabled(true),
|
||||
_EnableConstantValue(true),
|
||||
_DisableMemoryScheme(false),
|
||||
_NbCycleEnabled(true),
|
||||
_Node(NULL),
|
||||
_SchemeWidget(NULL)
|
||||
_SrcInputEnabled(true),
|
||||
_EnableConstantValue(true),
|
||||
_DisableMemoryScheme(false),
|
||||
_NbCycleEnabled(true),
|
||||
_Node(NULL),
|
||||
_SchemeWidget(NULL)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
_ui.constRangeUIntWidget->hide();
|
||||
|
|
|
@ -33,8 +33,8 @@ namespace NLQT
|
|||
|
||||
CAutoLODDialog::CAutoLODDialog(CWorkspaceNode *ownerNode, NL3D::CParticleSystem *ps, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
_Node(ownerNode),
|
||||
_PS(ps)
|
||||
_Node(ownerNode),
|
||||
_PS(ps)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -46,7 +46,6 @@ public:
|
|||
private Q_SLOTS:
|
||||
void setDegradationExponent(int value);
|
||||
void setSkipParticles(bool state);
|
||||
|
||||
void setDistRatio(float value);
|
||||
void setMaxDistLODBias(float value);
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ class CBinOpDialog : public QDialog
|
|||
|
||||
public:
|
||||
CBinOpDialog(QWidget *widget1, QWidget *widget2, QWidget *parent = 0);
|
||||
~CBinOpDialog();
|
||||
virtual ~CBinOpDialog();
|
||||
|
||||
virtual void init() = 0;
|
||||
|
||||
|
@ -86,7 +86,6 @@ public:
|
|||
_SchemeWrapper[k].Index = k ;
|
||||
}
|
||||
}
|
||||
|
||||
void init()
|
||||
{
|
||||
uint k ;
|
||||
|
|
|
@ -28,10 +28,10 @@ namespace NLQT
|
|||
|
||||
CurveEditDialog::CurveEditDialog(NL3D::CPSFloatCurveFunctor *curve, CWorkspaceNode *ownerNode, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
_scale(1.0),
|
||||
_pos(0.0),
|
||||
_Node(ownerNode),
|
||||
_Curve(curve)
|
||||
_scale(1.0),
|
||||
_pos(0.0),
|
||||
_Node(ownerNode),
|
||||
_Curve(curve)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -35,8 +35,8 @@ const int max_range = 9999;
|
|||
|
||||
CEditRangeUIntWidget::CEditRangeUIntWidget(QWidget *parent)
|
||||
: QWidget(parent),
|
||||
_Wrapper(NULL),
|
||||
_emit(true)
|
||||
_Wrapper(NULL),
|
||||
_emit(true)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -45,17 +45,17 @@ namespace NLQT
|
|||
|
||||
CSlotInfo::CSlotInfo()
|
||||
: Animation("empty"),
|
||||
Skeleton("empty"),
|
||||
Offset(0),
|
||||
StartTime(0),
|
||||
EndTime(0),
|
||||
StartBlend(1),
|
||||
EndBlend (1),
|
||||
Smoothness(1),
|
||||
SpeedFactor(1),
|
||||
ClampMode(0),
|
||||
SkeletonInverted(false),
|
||||
Enable(true)
|
||||
Skeleton("empty"),
|
||||
Offset(0),
|
||||
StartTime(0),
|
||||
EndTime(0),
|
||||
StartBlend(1),
|
||||
EndBlend (1),
|
||||
Smoothness(1),
|
||||
SpeedFactor(1),
|
||||
ClampMode(0),
|
||||
SkeletonInverted(false),
|
||||
Enable(true)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -81,14 +81,14 @@ CSlotInfo &CSlotInfo::operator=(const CSlotInfo &slotInfo)
|
|||
|
||||
CEntity::CEntity(void)
|
||||
: _Name("<Unknown>"),
|
||||
_FileNameShape(""),
|
||||
_FileNameSkeleton(""),
|
||||
_inPlace(false),
|
||||
_incPos(false),
|
||||
_Instance(NULL),
|
||||
_Skeleton(NULL),
|
||||
_PlayList(NULL),
|
||||
_AnimationSet(NULL)
|
||||
_FileNameShape(""),
|
||||
_FileNameSkeleton(""),
|
||||
_inPlace(false),
|
||||
_incPos(false),
|
||||
_Instance(NULL),
|
||||
_Skeleton(NULL),
|
||||
_PlayList(NULL),
|
||||
_AnimationSet(NULL)
|
||||
{
|
||||
_CharacterScalePos = 1;
|
||||
}
|
||||
|
|
|
@ -100,8 +100,8 @@ public:
|
|||
|
||||
SAnimationStatus()
|
||||
: LoopAnim(false), PlayAnim(false),
|
||||
CurrentTimeAnim(0), StartAnim(0),
|
||||
EndAnim(0), SpeedAnim(1), Mode(Mode::PlayList) {}
|
||||
CurrentTimeAnim(0), StartAnim(0),
|
||||
EndAnim(0), SpeedAnim(1), Mode(Mode::PlayList) {}
|
||||
};
|
||||
|
||||
/// Destructor
|
||||
|
|
|
@ -31,8 +31,8 @@ namespace NLQT
|
|||
|
||||
CFollowPathDialog::CFollowPathDialog(NL3D::CPSPlaneBasisFollowSpeed *pbfs, CWorkspaceNode *ownerNode, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
_FollowPath(pbfs),
|
||||
_Node(ownerNode)
|
||||
_FollowPath(pbfs),
|
||||
_Node(ownerNode)
|
||||
{
|
||||
resize(270, 90);
|
||||
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
|
||||
|
|
|
@ -35,8 +35,8 @@ namespace NLQT
|
|||
|
||||
CMorphMeshDialog::CMorphMeshDialog(CWorkspaceNode *ownerNode, NL3D::CPSConstraintMesh *cm, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
_Node(ownerNode),
|
||||
_CM(cm)
|
||||
_Node(ownerNode),
|
||||
_CM(cm)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -32,8 +32,8 @@ namespace NLQT
|
|||
|
||||
CMultiTexDialog::CMultiTexDialog(CWorkspaceNode *ownerNode, NL3D::CPSMultiTexturedParticle *mtp, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
_Node(ownerNode),
|
||||
_MTP(mtp)
|
||||
_Node(ownerNode),
|
||||
_MTP(mtp)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -35,18 +35,18 @@ namespace NLQT
|
|||
|
||||
CParticleEditor::CParticleEditor(void)
|
||||
: _ActiveNode(NULL),
|
||||
_State(State::Stopped),
|
||||
_Speed(1.0f),
|
||||
_AutoRepeat(false),
|
||||
_DisplayBBox(false),
|
||||
_DisplayHelpers(false),
|
||||
_AutoUpdateBBox(false),
|
||||
_EmptyBBox(true),
|
||||
_PW(NULL),
|
||||
_Driver(NULL),
|
||||
_Scene(NULL),
|
||||
_FontManager(NULL),
|
||||
_FontGen(NULL)
|
||||
_State(State::Stopped),
|
||||
_Speed(1.0f),
|
||||
_AutoRepeat(false),
|
||||
_DisplayBBox(false),
|
||||
_DisplayHelpers(false),
|
||||
_AutoUpdateBBox(false),
|
||||
_EmptyBBox(true),
|
||||
_PW(NULL),
|
||||
_Driver(NULL),
|
||||
_Scene(NULL),
|
||||
_FontManager(NULL),
|
||||
_FontGen(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ bool CParticleTreeItem::replace(const QList<QVariant> &data)
|
|||
|
||||
bool CParticleTreeItem::deleteChild(int row)
|
||||
{
|
||||
_childItems.removeAt(row);
|
||||
delete _childItems.takeAt(row);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ static std::map<std::string, uint> _PSElementIdentifiers;
|
|||
|
||||
CParticleWorkspaceDialog::CParticleWorkspaceDialog(QWidget *parent)
|
||||
: QDockWidget(parent),
|
||||
_currentItem(NULL)
|
||||
_currentItem(NULL)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -33,9 +33,9 @@ namespace NLQT
|
|||
|
||||
CSlotGroupBox::CSlotGroupBox(QWidget *parent)
|
||||
: QGroupBox(parent),
|
||||
_animName("empty"),
|
||||
_skelName("empty"),
|
||||
_numSlot(0)
|
||||
_animName("empty"),
|
||||
_skelName("empty"),
|
||||
_numSlot(0)
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
|
|
|
@ -34,8 +34,8 @@ namespace NLQT
|
|||
|
||||
CSoundSystem::CSoundSystem()
|
||||
:_AudioMixer(NULL),
|
||||
_AnimManager(NULL),
|
||||
_Zero(NLMISC::CVector::Null)
|
||||
_AnimManager(NULL),
|
||||
_Zero(NLMISC::CVector::Null)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
@ -25,8 +25,8 @@ namespace NLQT
|
|||
|
||||
CSpinnerDialog::CSpinnerDialog(NL3D::CPSBasisSpinner *sf, CWorkspaceNode *ownerNode, QWidget *parent)
|
||||
: QDialog(parent),
|
||||
_Node(ownerNode),
|
||||
_BasicSpinner(sf)
|
||||
_Node(ownerNode),
|
||||
_BasicSpinner(sf)
|
||||
{
|
||||
nlassert(_BasicSpinner);
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
<item row="0" column="0">
|
||||
<widget class="QSlider" name="horizontalSlider">
|
||||
<property name="maximum">
|
||||
<number>1000</number>
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
|
@ -36,7 +36,7 @@
|
|||
<enum>QSlider::TicksAbove</enum>
|
||||
</property>
|
||||
<property name="tickInterval">
|
||||
<number>100</number>
|
||||
<number>50</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
@ -96,6 +96,8 @@ template <typename T>
|
|||
class CValueBlenderDialogClientT : public IValueBlenderDialogClient
|
||||
{
|
||||
public:
|
||||
virtual ~CValueBlenderDialogClientT() {}
|
||||
|
||||
// the scheme being used. Must be set by the user
|
||||
NL3D::CPSValueBlendFuncBase<T> *SchemeFunc;
|
||||
|
||||
|
@ -143,6 +145,8 @@ protected:
|
|||
class CFloatBlenderDialogClient : public CValueBlenderDialogClientT<float>
|
||||
{
|
||||
public:
|
||||
~CFloatBlenderDialogClient() {}
|
||||
|
||||
QWidget *newDialog(IPSWrapper<float> *wrapper, QWidget *parent)
|
||||
{
|
||||
CEditRangeFloatWidget *erf = new CEditRangeFloatWidget(parent);
|
||||
|
@ -158,6 +162,8 @@ public:
|
|||
class CUIntBlenderDialogClient : public CValueBlenderDialogClientT<uint32>
|
||||
{
|
||||
public:
|
||||
~CUIntBlenderDialogClient() {}
|
||||
|
||||
QWidget *newDialog(IPSWrapper<uint32> *wrapper, QWidget *parent)
|
||||
{
|
||||
CEditRangeUIntWidget *erf = new CEditRangeUIntWidget(parent);
|
||||
|
@ -173,6 +179,8 @@ public:
|
|||
class CIntBlenderDialogClient : public CValueBlenderDialogClientT<sint32>
|
||||
{
|
||||
public:
|
||||
~CIntBlenderDialogClient() {}
|
||||
|
||||
QWidget *newDialog(IPSWrapper<sint32> *wrapper, QWidget *parent)
|
||||
{
|
||||
CEditRangeIntWidget *erf = new CEditRangeIntWidget(parent);
|
||||
|
@ -188,6 +196,8 @@ public:
|
|||
class CRGBABlenderDialogClient : public CValueBlenderDialogClientT<NLMISC::CRGBA>
|
||||
{
|
||||
public:
|
||||
~CRGBABlenderDialogClient() {}
|
||||
|
||||
QWidget *newDialog(IPSWrapper<NLMISC::CRGBA> *wrapper, QWidget *parent)
|
||||
{
|
||||
CColorEditWidget *ce = new CColorEditWidget(parent);
|
||||
|
|
|
@ -59,6 +59,7 @@ class IValueGradientClient: public QObject
|
|||
Q_OBJECT
|
||||
public:
|
||||
IValueGradientClient(QObject *parent = 0): QObject(parent) {}
|
||||
virtual ~IValueGradientClient() {}
|
||||
|
||||
virtual QWidget *createDialog(QWidget *parent) = 0;
|
||||
|
||||
|
@ -168,6 +169,7 @@ class CValueGradientClientT : public IValueGradientClient, public IPSWrapper<T>
|
|||
{
|
||||
public:
|
||||
CValueGradientClientT(QObject *parent = 0): IValueGradientClient(parent) {}
|
||||
virtual ~CValueGradientClientT() {}
|
||||
|
||||
/// the gradient being edited, must be filled by the instancier
|
||||
NL3D::CPSValueGradientFunc<T> *Scheme;
|
||||
|
@ -268,6 +270,7 @@ class CFloatGradientWrapper : public CValueGradientClientT<float>
|
|||
Q_OBJECT
|
||||
public:
|
||||
CFloatGradientWrapper(QObject *parent = 0): CValueGradientClientT<float>(parent) {}
|
||||
~CFloatGradientWrapper() {}
|
||||
|
||||
virtual QWidget *newDialog(IPSWrapperFloat *wrapper, QWidget *parent)
|
||||
{
|
||||
|
@ -304,6 +307,7 @@ class CUIntGradientWrapper : public CValueGradientClientT<uint32>
|
|||
Q_OBJECT
|
||||
public:
|
||||
CUIntGradientWrapper(QObject *parent = 0): CValueGradientClientT<uint32>(parent) {}
|
||||
~CUIntGradientWrapper() {}
|
||||
|
||||
virtual QWidget *newDialog(IPSWrapperUInt *wrapper, QWidget *parent)
|
||||
{
|
||||
|
@ -340,6 +344,7 @@ class CIntGradientWrapper : public CValueGradientClientT<sint32>
|
|||
Q_OBJECT
|
||||
public:
|
||||
CIntGradientWrapper(QObject *parent = 0): CValueGradientClientT<sint32>(parent) {}
|
||||
~CIntGradientWrapper() {}
|
||||
|
||||
virtual QWidget *newDialog(IPSWrapper<sint32> *wrapper, QWidget *parent)
|
||||
{
|
||||
|
@ -376,6 +381,7 @@ class CColorGradientWrapper : public CValueGradientClientT<NLMISC::CRGBA>
|
|||
Q_OBJECT
|
||||
public:
|
||||
CColorGradientWrapper(QObject *parent = 0): CValueGradientClientT<NLMISC::CRGBA>(parent) {}
|
||||
~CColorGradientWrapper() {}
|
||||
|
||||
virtual QWidget *newDialog(IPSWrapper<NLMISC::CRGBA> *wrapper, QWidget *parent)
|
||||
{
|
||||
|
@ -418,6 +424,7 @@ class CPlaneBasisGradientWrapper : public CValueGradientClientT<NL3D::CPlaneBasi
|
|||
Q_OBJECT
|
||||
public:
|
||||
CPlaneBasisGradientWrapper(QObject *parent = 0): CValueGradientClientT<NL3D::CPlaneBasis>(parent) {}
|
||||
~CPlaneBasisGradientWrapper() {}
|
||||
|
||||
virtual QWidget *newDialog(IPSWrapper<NL3D::CPlaneBasis> *wrapper, QWidget *parent)
|
||||
{
|
||||
|
@ -455,6 +462,8 @@ public:
|
|||
|
||||
CTextureGradientInterface(NL3D::CPSTexturedParticle *tp, CWorkspaceNode *ownerNode): Node(ownerNode), TP(tp) {}
|
||||
|
||||
~CTextureGradientInterface() {}
|
||||
|
||||
CWorkspaceNode *Node;
|
||||
NL3D::CPSTexturedParticle *TP;
|
||||
|
||||
|
|
Loading…
Reference in a new issue