Selaa lähdekoodia

Remove empty models from the bundle and stop tracking vcxproj.user file

- While working in a model you can end up with a lot of dump mesh
objects without vertices. Nevertheless this is exported (at least in
Blender) and crash the encoder.
- Remove user specific file.
hammeron-art 10 vuotta sitten
vanhempi
sitoutus
7c45feed7e

+ 1 - 0
.gitignore

@@ -44,6 +44,7 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /tools/encoder/Release
 /tools/encoder/gameplay-encoder.xcodeproj/xcuserdata
 /tools/encoder/gameplay-encoder.xcodeproj/project.xcworkspace/
+/tools/encoder/gameplay-encoder.vcxproj.user
 
 /tools/luagen
 /tools/luagen/Release

+ 0 - 15
tools/encoder/gameplay-encoder.vcxproj.user

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments />
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerEnvironment />
-    <LocalDebuggerWorkingDirectory>.\Debug</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerEnvironment />
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments />
-    <LocalDebuggerWorkingDirectory>.\Release</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
-</Project>

+ 1 - 1
tools/encoder/src/FBXSceneEncoder.cpp

@@ -843,7 +843,7 @@ void FBXSceneEncoder::loadLight(FbxNode* fbxNode, Node* node)
 void FBXSceneEncoder::loadModel(FbxNode* fbxNode, Node* node)
 {
     FbxMesh* fbxMesh = fbxNode->GetMesh();
-    if (!fbxMesh)
+	if (!fbxMesh || fbxMesh->GetPolygonVertexCount() == 0)
     {
         return;
     }