diff --git a/FexTracker/FexTrackerRel.dll b/FexTracker/FexTrackerRel.dll index b4e60b0eb..b9077cba3 100644 Binary files a/FexTracker/FexTrackerRel.dll and b/FexTracker/FexTrackerRel.dll differ diff --git a/FexTracker/FexTrackerRel.lib b/FexTracker/FexTrackerRel.lib index 583e065cd..48e8cb45b 100644 Binary files a/FexTracker/FexTrackerRel.lib and b/FexTracker/FexTrackerRel.lib differ diff --git a/FexTracker/FexTrackerRel_Opti.dll b/FexTracker/FexTrackerRel_Opti.dll index b08b1b9a0..c39c52878 100644 Binary files a/FexTracker/FexTrackerRel_Opti.dll and b/FexTracker/FexTrackerRel_Opti.dll differ diff --git a/FexTracker/FexTrackerRel_Opti.lib b/FexTracker/FexTrackerRel_Opti.lib index 9a6ea2df9..867e4978c 100644 Binary files a/FexTracker/FexTrackerRel_Opti.lib and b/FexTracker/FexTrackerRel_Opti.lib differ diff --git a/core/FexMovement.h b/core/FexMovement.h new file mode 100644 index 000000000..be657c915 --- /dev/null +++ b/core/FexMovement.h @@ -0,0 +1,36 @@ +// FexMovement.h: interface for the FexMovement class. +// +////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_FEXMOVEMENT_H__63D8ADD8_4EA1_4C56_8D6F_7B587A1A61A4__INCLUDED_) +#define AFX_FEXMOVEMENT_H__63D8ADD8_4EA1_4C56_8D6F_7B587A1A61A4__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +typedef struct +{ + vec2 Pos; + vec3 Rot; + vec2 Scale; +}FexMovementFrame; + +#include "tenlist.h" +class FexMovement +{ +public: + FexMovement(); + ~FexMovement(); + + void Load( const char* Filename ); + void Save( const char* Filename ); + + const char* GetUniqueName(); + + tenlist Frames; +}; + +void FEXTRACKER_API DeleteMovement( FexMovement* delme ); + +#endif // !defined(AFX_FEXMOVEMENT_H__63D8ADD8_4EA1_4C56_8D6F_7B587A1A61A4__INCLUDED_) diff --git a/core/FexTracker.h b/core/FexTracker.h index 5787680b0..7e82b238b 100644 --- a/core/FexTracker.h +++ b/core/FexTracker.h @@ -90,6 +90,8 @@ public: FexTrackingFeature* operator [] ( int i ); inline int GetCount(){ return nFeatures; }; inline int GetFrame(){ return CurFrame; }; + inline int GetSizeX(){ return SizX; }; + inline int GetSizeY(){ return SizY; }; bool bDebug; int minFeatures;