TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 07:15:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0' into SoundAssetImplements

Browse source 
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
This commit is contained in:
AzaezelX 2021-10-11 20:11:27 -05:00
commit f5600826d7
122 changed files with 686 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/afx/util/afxAnimCurve.h
View file

@ -56,7 +56,7 @@ class afxAnimCurve
public:
afxAnimCurve();
~afxAnimCurve();
virtual ~afxAnimCurve();
void addKey( Point2F &v );
void addKey( F32 time, F32 value );

1
Engine/source/afx/util/afxCurveEval.h
View file

@ -32,6 +32,7 @@
class afxCurveEval
{
public:
virtual ~afxCurveEval() { }
virtual Point2F evaluateCurve(Point2F& v0, Point2F& v1, F32 t)=0;
virtual Point2F evaluateCurve(Point2F& v0, Point2F& v1, Point2F& t0, Point2F& t1, F32 t)=0;
virtual Point2F evaluateCurveTangent(Point2F& v0, Point2F& v1, F32 t)=0;

3
Engine/source/afx/xm/afxXM_WaveBase.h
View file

@ -81,6 +81,7 @@ public:
class afxXM_WaveInterp
{
public:
virtual ~afxXM_WaveInterp() { }
virtual void interpolate(F32 t, afxXM_Params& params)=0;
virtual void pulse()=0;
@ -250,7 +251,7 @@ protected:
public:
/*C*/ afxXM_WaveBase(afxXM_WaveBaseData*, afxEffectWrapper*, afxXM_WaveInterp*);
/*D*/ ~afxXM_WaveBase();
/*D*/ virtual ~afxXM_WaveBase();
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
};