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

Merge branch 'development' into style-cleanup

Browse source 
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-15 12:15:55 +11:00
commit 33ff180593
2053 changed files with 172002 additions and 69530 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/ts/loader/tsShapeLoader.h
View file

@ -45,6 +45,19 @@
class TSShapeLoader
{
// Supported Format List
protected:
struct ShapeFormat
{
String mName;
String mExtension;
};
static Vector<ShapeFormat> smFormats;
public:
static void addFormat(String name, String extension);
static String getFormatExtensions();
static String getFormatFilters();
public:
enum eLoadPhases
{