Moved gameplay-encoder to use FBX 2015.1 SDK

tools/encoder/README.md

@@ -1,8 +1,8 @@
 ## gameplay-encoder
 Command-line tool for encoding games assets like true-type fonts and 3D scene files
 into a simple binary-based bundle file format for the gameplay 3D game framework runtime. 
-The 'bin' folder contains pre-built 32-bit versions of the gameplay-encoder executables for 
-Windows 7, MacOS X and Linux Ubuntu with support built-in support for:
+The 'bin' folder contains pre-built 62-bit versions of the gameplay-encoder executables for 
+Windows 7, MacOS X and Linux Ubuntu 14.04 with support built-in support for:
 
 ## TrueType Font
 TrueType Fonts represent a standard in defining outline fonts and has become the 
@@ -11,20 +11,15 @@ them into a texture mapped base representation using a texture atlas and 8-bit a
 representation.
 
 ## FBX Scene
-Autodesk® FBX® asset exchange technology facilitates higher-fidelity data exchange 
-between several Autodesk content creation packages
+Autodesk® FBX® asset exchange technology facilitates higher-fidelity data exchange between several Autodesk content creation packages
 Autodesk® Maya®, Autodesk® 3ds Max®, Autodesk® MotionBuilder®, Autodesk® Mudbox®, and Autodesk® Softimage®
-For more information goto "http://www.autodesk.com/fbx".
+For more information goto: "http://www.autodesk.com/fbx".
 
 ## Running gameplay-encoder
 Simply execute the gameplay-encoder command-line executable:
 
 `Usage: gameplay-encoder [options] <file(s)>`
 
-Note: On Linux Ubuntu (64-bit), you must first install the required 32-bit libs via:
-
-`sudo apt-get install ia32-libs`
-
 ## Building gameplay-encoder
 
 See [Building gameplay-encoder](https://github.com/blackberry/GamePlay/wiki/Building-gameplay-encoder) on the wiki.

tools/encoder/gameplay-encoder.xcodeproj/project.pbxproj

@@ -13,13 +13,10 @@
 		422BF0861804C16E0028D009 /* libm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 422BF0851804C16E0028D009 /* libm.dylib */; };
 		422BF0881804C1E40028D009 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 422BF0871804C1E40028D009 /* libbz2.dylib */; };
 		422BF0901804C5230028D009 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 422BF08F1804C5230028D009 /* libstdc++.dylib */; };
-		422BF0921804C7060028D009 /* libfbxsdk-static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 422BF0911804C7060028D009 /* libfbxsdk-static.a */; };
 		4251B12C152D044B002F6199 /* Curve.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4251B128152D044B002F6199 /* Curve.cpp */; };
 		4262783C180491D60015672B /* edtaa3func.c in Sources */ = {isa = PBXBuildFile; fileRef = 4262783A180491D60015672B /* edtaa3func.c */; };
 		42783423148D6F7500A6E27F /* FBXSceneEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4278341E148D6F7500A6E27F /* FBXSceneEncoder.cpp */; };
 		4283905914896E6C00E2B2F5 /* BoundingVolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4283905714896E6C00E2B2F5 /* BoundingVolume.cpp */; };
-		42C0CE9C1804829E006B2F23 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C0CE9B1804829E006B2F23 /* libpng.a */; };
-		42C0CE9E180482B8006B2F23 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C0CE9D180482B8006B2F23 /* libfreetype.a */; };
 		42C8EE0A14724CD700E43619 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C8EDB714724CD700E43619 /* Animation.cpp */; };
 		42C8EE0B14724CD700E43619 /* AnimationChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C8EDB914724CD700E43619 /* AnimationChannel.cpp */; };
 		42C8EE0C14724CD700E43619 /* Animations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C8EDBB14724CD700E43619 /* Animations.cpp */; };
@@ -58,6 +55,9 @@
 		42C8EE3314724CD700E43619 /* VertexElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C8EE0814724CD700E43619 /* VertexElement.cpp */; };
 		42C8EE371472D7E700E43619 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C8EE361472D7E700E43619 /* libxml2.dylib */; };
 		42C8EE391472DAA300E43619 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C8EE381472DAA300E43619 /* libz.dylib */; };
+		42F7155C195CAF5E0010141C /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42F7155B195CAF5E0010141C /* libfreetype.a */; };
+		42F7155E195CAF6B0010141C /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42F7155D195CAF6B0010141C /* libpng.a */; };
+		42F71560195CAFC60010141C /* libfbxsdk-static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42F7155F195CAFC60010141C /* libfbxsdk-static.a */; };
 		B661733F16A61CE40083A307 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B661733D16A61CE40083A307 /* Image.cpp */; };
 		B661734316A61CFA0083A307 /* NormalMapGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B661734116A61CFA0083A307 /* NormalMapGenerator.cpp */; };
 		C076C905174F6D2E00645678 /* Constants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C076C8FF174F6D2E00645678 /* Constants.cpp */; };
@@ -85,7 +85,6 @@
 		422BF0851804C16E0028D009 /* libm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libm.dylib; path = ../../../../../../usr/lib/libm.dylib; sourceTree = "<group>"; };
 		422BF0871804C1E40028D009 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = ../../../../../../usr/lib/libbz2.dylib; sourceTree = "<group>"; };
 		422BF08F1804C5230028D009 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "../../../../../../usr/lib/libstdc++.dylib"; sourceTree = "<group>"; };
-		422BF0911804C7060028D009 /* libfbxsdk-static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfbxsdk-static.a"; path = "../../../../../../Applications/Autodesk/FBX SDK/2014.2.1/lib/gcc4/ub/release/libfbxsdk-static.a"; sourceTree = "<group>"; };
 		42475CE6147208A000610A6A /* gameplay-encoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gameplay-encoder"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4251B128152D044B002F6199 /* Curve.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Curve.cpp; path = src/Curve.cpp; sourceTree = SOURCE_ROOT; };
 		4251B129152D044B002F6199 /* Curve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Curve.h; path = src/Curve.h; sourceTree = SOURCE_ROOT; };
@@ -100,8 +99,6 @@
 		42783422148D6F7500A6E27F /* Vector4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Vector4.inl; path = src/Vector4.inl; sourceTree = SOURCE_ROOT; };
 		4283905714896E6C00E2B2F5 /* BoundingVolume.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BoundingVolume.cpp; path = src/BoundingVolume.cpp; sourceTree = SOURCE_ROOT; };
 		4283905814896E6C00E2B2F5 /* BoundingVolume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BoundingVolume.h; path = src/BoundingVolume.h; sourceTree = SOURCE_ROOT; };
-		42C0CE9B1804829E006B2F23 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/libpng.a"; sourceTree = "<group>"; };
-		42C0CE9D180482B8006B2F23 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "../../external-deps/freetype2/lib/macosx/libfreetype.a"; sourceTree = "<group>"; };
 		42C8EDB714724CD700E43619 /* Animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Animation.cpp; path = src/Animation.cpp; sourceTree = SOURCE_ROOT; };
 		42C8EDB814724CD700E43619 /* Animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Animation.h; path = src/Animation.h; sourceTree = SOURCE_ROOT; };
 		42C8EDB914724CD700E43619 /* AnimationChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationChannel.cpp; path = src/AnimationChannel.cpp; sourceTree = SOURCE_ROOT; };
@@ -175,6 +172,9 @@
 		42C8EE0914724CD700E43619 /* VertexElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VertexElement.h; path = src/VertexElement.h; sourceTree = SOURCE_ROOT; };
 		42C8EE361472D7E700E43619 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
 		42C8EE381472DAA300E43619 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		42F7155B195CAF5E0010141C /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "../../external-deps/freetype2/lib/macosx/x64/libfreetype.a"; sourceTree = "<group>"; };
+		42F7155D195CAF6B0010141C /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/x64/libpng.a"; sourceTree = "<group>"; };
+		42F7155F195CAFC60010141C /* libfbxsdk-static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfbxsdk-static.a"; path = "../../../../../../Applications/Autodesk/FBX SDK/2015.1/lib/clang/release/libfbxsdk-static.a"; sourceTree = "<group>"; };
 		B661733D16A61CE40083A307 /* Image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Image.cpp; path = src/Image.cpp; sourceTree = SOURCE_ROOT; };
 		B661733E16A61CE40083A307 /* Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Image.h; path = src/Image.h; sourceTree = SOURCE_ROOT; };
 		B661734116A61CFA0083A307 /* NormalMapGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NormalMapGenerator.cpp; path = src/NormalMapGenerator.cpp; sourceTree = SOURCE_ROOT; };
@@ -197,14 +197,14 @@
 			files = (
 				42C8EE391472DAA300E43619 /* libz.dylib in Frameworks */,
 				42C8EE371472D7E700E43619 /* libxml2.dylib in Frameworks */,
-				42C0CE9C1804829E006B2F23 /* libpng.a in Frameworks */,
 				4228A3FF1620A5A300955433 /* Cocoa.framework in Frameworks */,
 				422BF0901804C5230028D009 /* libstdc++.dylib in Frameworks */,
-				422BF0921804C7060028D009 /* libfbxsdk-static.a in Frameworks */,
 				422BF0881804C1E40028D009 /* libbz2.dylib in Frameworks */,
+				42F71560195CAFC60010141C /* libfbxsdk-static.a in Frameworks */,
 				422BF0861804C16E0028D009 /* libm.dylib in Frameworks */,
-				42C0CE9E180482B8006B2F23 /* libfreetype.a in Frameworks */,
+				42F7155C195CAF5E0010141C /* libfreetype.a in Frameworks */,
 				4228A4011620A5EC00955433 /* SystemConfiguration.framework in Frameworks */,
+				42F7155E195CAF6B0010141C /* libpng.a in Frameworks */,
 				4228A4031620A63F00955433 /* libiconv.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -347,15 +347,15 @@
 		427D4F44147DC9080076760E /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				42C0CE9D180482B8006B2F23 /* libfreetype.a */,
-				42C0CE9B1804829E006B2F23 /* libpng.a */,
+				42F7155F195CAFC60010141C /* libfbxsdk-static.a */,
+				42F7155B195CAF5E0010141C /* libfreetype.a */,
+				42F7155D195CAF6B0010141C /* libpng.a */,
 				422BF0851804C16E0028D009 /* libm.dylib */,
 				422BF0871804C1E40028D009 /* libbz2.dylib */,
 				422BF08F1804C5230028D009 /* libstdc++.dylib */,
 				42C8EE381472DAA300E43619 /* libz.dylib */,
 				42C8EE361472D7E700E43619 /* libxml2.dylib */,
 				4228A4021620A63F00955433 /* libiconv.dylib */,
-				422BF0911804C7060028D009 /* libfbxsdk-static.a */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -466,7 +466,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++98";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -495,22 +495,23 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2.1/include\"",
+					"\"/Applications/Autodesk/FBX SDK/2015.1/include\"",
 					"../../external-deps/png/include",
 					"../../external-deps/freetype2/include",
 				);
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				LIBRARY_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2.1/lib/gcc4/ub/release\"",
-					"../../external-deps/png/lib/macosx",
-					"../../external-deps/freetype2/lib/macosx",
+					"\"/Applications/Autodesk/FBX SDK/2015.1/lib/clang/release\"",
+					"../../external-deps/png/lib/macosx/x64",
+					"../../external-deps/freetype2/lib/macosx/x64",
 				);
 				MACH_O_TYPE = mh_execute;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_TEST_FLAGS = "";
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
 				WARNING_CFLAGS = "";
 			};
 			name = Debug;
@@ -519,7 +520,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++98";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -543,21 +544,22 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2.1/include\"",
+					"\"/Applications/Autodesk/FBX SDK/2015.1/include\"",
 					"../../external-deps/png/include",
 					"../../external-deps/freetype2/include",
 				);
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				LIBRARY_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2.1/lib/gcc4/ub/release\"",
-					"../../external-deps/png/lib/macosx",
-					"../../external-deps/freetype2/lib/macosx",
+					"\"/Applications/Autodesk/FBX SDK/2015.1/lib/clang/release\"",
+					"../../external-deps/png/lib/macosx/x64",
+					"../../external-deps/freetype2/lib/macosx/x64",
 				);
 				MACH_O_TYPE = mh_execute;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_TEST_FLAGS = "";
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
 				WARNING_CFLAGS = "";
 			};
 			name = Release;
@@ -565,6 +567,7 @@
 		42475CF1147208A100610A6A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
@@ -576,19 +579,26 @@
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../external-deps/freetype2/lib/macosx",
-					"../../external-deps/png/lib/macosx",
-					"/Applications/Autodesk/FBX\\ SDK/2014.2.1/lib/gcc4/ub/release",
-					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2014.2.1/lib/gcc4/ub/release",
+					"../../external-deps/freetype2/lib/macosx/x64",
+					"../../external-deps/png/lib/macosx/x64",
+					/Applications/Autodesk/FBX,
+					SDK/2015.1/lib/clang/release,
+					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2015.1/lib/clang/release",
+					"$(SYSTEM_APPS_DIR)/Autodesk/FBX",
+					SDK/2015.1/lib/clang/release,
+					"/Users/setaylor/Code/GamePlay/external-deps/freetype2/lib/macosx/x64",
+					"/Users/setaylor/Code/GamePlay/external-deps/png/lib/macosx/x64",
 				);
 				MACH_O_TYPE = mh_execute;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
 		42475CF2147208A100610A6A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
@@ -605,9 +615,14 @@
 					/Applications/Autodesk/FBX,
 					SDK/2014.2.1/lib/gcc4/ub/release,
 					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2014.2.1/lib/gcc4/ub/release",
+					"$(SYSTEM_APPS_DIR)/Autodesk/FBX",
+					SDK/2015.1/lib/clang/release,
+					"/Users/setaylor/Code/GamePlay/external-deps/freetype2/lib/macosx/x64",
+					"/Users/setaylor/Code/GamePlay/external-deps/png/lib/macosx/x64",
 				);
 				MACH_O_TYPE = mh_execute;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};

tools/encoder/gameplay-encoder.xcodeproj/xcshareddata/xcschemes/gameplay-encoder.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

tools/encoder/src/EncoderArguments.cpp

@@ -10,7 +10,7 @@
 
 // The encoder version number should be incremented when a feature is added to the encoder.
 // The encoder version is not the same as the GPB version.
-#define ENCODER_VERSION "2.0.0"
+#define ENCODER_VERSION "3.0.0"
 #define HEIGHTMAP_SIZE_MAX 2049
 
 namespace gameplay

tools/encoder/src/FBXSceneEncoder.cpp

@@ -159,7 +159,10 @@ void FBXSceneEncoder::loadScene(FbxScene* fbxScene)
     if (rootNode)
     {
         print("Triangulate.");
-        triangulateRecursive(rootNode);
+        FbxGeometryConverter converter(rootNode->GetFbxManager());
+        converter.Triangulate(fbxScene, true);
+        //triangulateRecursive(rootNode);
+        
 
         print("Load nodes.");
         // Don't include the FBX root node in the GPB.
@@ -1289,6 +1292,7 @@ Mesh* FBXSceneEncoder::loadMesh(FbxMesh* fbxMesh)
     return mesh;
 }
 
+/*
 void FBXSceneEncoder::triangulateRecursive(FbxNode* fbxNode)
 {
     // Triangulate all NURBS, patch and mesh under this node recursively.
@@ -1302,7 +1306,7 @@ void FBXSceneEncoder::triangulateRecursive(FbxNode* fbxNode)
             type == FbxNodeAttribute::ePatch)
         {
             FbxGeometryConverter converter(fbxNode->GetFbxManager());
-            converter.TriangulateInPlace(fbxNode);
+            converter.T
         }
     }
 
@@ -1312,6 +1316,7 @@ void FBXSceneEncoder::triangulateRecursive(FbxNode* fbxNode)
         triangulateRecursive(fbxNode->GetChild(childIndex));
     }
 }
+ */
 
 // Functions
 

tools/luagen/gameplay-luagen.xcodeproj/project.pbxproj

@@ -12,7 +12,7 @@
 		42B7F6FF15B06EFE002BB8C3 /* FunctionBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6F715B06EFE002BB8C3 /* FunctionBinding.cpp */; };
 		42B7F70015B06EFE002BB8C3 /* Generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6F915B06EFE002BB8C3 /* Generator.cpp */; };
 		42B7F70115B06EFE002BB8C3 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7F6FB15B06EFE002BB8C3 /* main.cpp */; };
-		42B7F71215B06F67002BB8C3 /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7F71115B06F67002BB8C3 /* libtinyxml2.a */; };
+		42F71562195CB2760010141C /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42F71561195CB2760010141C /* libtinyxml2.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -41,7 +41,7 @@
 		42B7F6FA15B06EFE002BB8C3 /* Generator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Generator.h; path = src/Generator.h; sourceTree = SOURCE_ROOT; };
 		42B7F6FB15B06EFE002BB8C3 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
 		42B7F6FC15B06EFE002BB8C3 /* TypedefBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TypedefBinding.h; path = src/TypedefBinding.h; sourceTree = SOURCE_ROOT; };
-		42B7F71115B06F67002BB8C3 /* libtinyxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtinyxml2.a; path = "../external-deps/tinyxml2/lib/macosx/libtinyxml2.a"; sourceTree = "<group>"; };
+		42F71561195CB2760010141C /* libtinyxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtinyxml2.a; path = "../../external-deps/tinyxml2/lib/macosx/x64/libtinyxml2.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,7 +49,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				42B7F71215B06F67002BB8C3 /* libtinyxml2.a in Frameworks */,
+				42F71562195CB2760010141C /* libtinyxml2.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -96,7 +96,7 @@
 		42B7F70B15B06F3A002BB8C3 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				42B7F71115B06F67002BB8C3 /* libtinyxml2.a */,
+				42F71561195CB2760010141C /* libtinyxml2.a */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -210,24 +210,32 @@
 		42B7F6EB15B06E85002BB8C3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				HEADER_SEARCH_PATHS = "../../external-deps/tinyxml2/include";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../external-deps/tinyxml2/lib/macosx",
+					"../../external-deps/tinyxml2/lib/macosx/x64",
+					"/Users/setaylor/Code/GamePlay/external-deps/tinyxml2/lib/macosx/x64",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
 		42B7F6EC15B06E85002BB8C3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				HEADER_SEARCH_PATHS = "../../external-deps/tinyxml2/include";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"../../external-deps/tinyxml2/lib/macosx",
+					"../../external-deps/tinyxml2/lib/macosx/x64",
+					"/Users/setaylor/Code/GamePlay/external-deps/tinyxml2/lib/macosx/x64",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};