Skip to content

Commit

Permalink
tweaks for release
Browse files Browse the repository at this point in the history
  • Loading branch information
@inwoods
inwoods committed Jun 11, 2017
1 parent 2ee0a45 commit 8b385c8
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 51 deletions.
82 changes: 33 additions & 49 deletions examples/import/Assets/Editor/FbxImporter04.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//#define UNI_18844
//#define UNI_18850
//#define UNI_19014
// ***********************************************************************
// Copyright (c) 2017 Unity Technologies. All rights reserved.
//
Expand Down Expand Up @@ -62,8 +59,8 @@ private Vector2 [] ProcessUVSet (FbxLayerElementUV element,
// direct or via-index
bool isDirect = referenceMode == FbxLayerElement.EReferenceMode.eDirect;

FbxLayerElementArray fbxElementArray = element.GetDirectArray ();
FbxLayerElementArray fbxIndexArray = isDirect ? null : element.GetIndexArray ();
var fbxElementArray = element.GetDirectArray ();
var fbxIndexArray = isDirect ? null : element.GetIndexArray ();

if (mappingMode == FbxLayerElement.EMappingMode.eByControlPoint) {

Expand All @@ -76,14 +73,15 @@ private Vector2 [] ProcessUVSet (FbxLayerElementUV element,
for (int i = 0; i < polygonVertexIndices.Length; i++) {
int index = i;
if (!isDirect) {
#if UNI_18850
fbxIndexArray.GetAt (i, out index);
#endif
index = fbxIndexArray.GetAt (i);
}

#if UNI_18850
fbxElementArray.GetAt (polygonVertexIndices [index], out result [i]);
#endif
FbxVector2 fbxVector2 = fbxElementArray.GetAt (polygonVertexIndices [index]);
Debug.Assert (fbxVector2.X >= float.MinValue && fbxVector2.X <= float.MaxValue);
Debug.Assert (fbxVector2.Y >= float.MinValue && fbxVector2.Y <= float.MaxValue);

result [i] = new Vector2 ((float)fbxVector2.X, (float)fbxVector2.Y);

// UVs in FBX can contain NaNs, so we set these vertices to (0,0)
if (float.IsNaN (result [i] [0]) || float.IsNaN (result [i] [1])) {
Debug.LogWarning (string.Format ("invalid UV detected at {0}", i));
Expand All @@ -92,15 +90,13 @@ private Vector2 [] ProcessUVSet (FbxLayerElementUV element,
}

} else if (mappingMode == FbxLayerElement.EMappingMode.eAllSame) {
Vector2 value = new Vector2 ();
FbxVector2 fbxVector2 = fbxElementArray.GetAt (0);
Debug.Assert (fbxVector2.X >= float.MinValue && fbxVector2.X <= float.MaxValue);
Debug.Assert (fbxVector2.Y >= float.MinValue && fbxVector2.Y <= float.MaxValue);

#if UNI_18850
if (fbxElementArray.GetAt (0, value))
#endif
{
for (int i = 0; i < polygonVertexIndices.Length; i++) {
result [i] = value;
}
Vector2 value = new Vector2((float)fbxVector2.X, (float)fbxVector2.Y);
for (int i = 0; i < polygonVertexIndices.Length; i++) {
result [i] = value;
}
} else {
Debug.LogError ("unsupported UV-to-Component mapping mode");
Expand Down Expand Up @@ -141,10 +137,8 @@ private void ProcessUVs (FbxMesh fbxMesh, Mesh unityMesh, int maxUVs = 4)
if (fbxLayer == null)
continue;

FbxLayerElementUV fbxUVSet = null;
#if UNI_19014
fbxUVSet = fbxLayer.GetUVs ();
#endif
FbxLayerElementUV fbxUVSet = fbxLayer.GetUVs ();

if (fbxUVSet == null)
continue;

Expand Down Expand Up @@ -184,10 +178,9 @@ private void ProcessUVs (FbxMesh fbxMesh, Mesh unityMesh, int maxUVs = 4)
// TODO: check if we've already passed eTextureEmissive layer
for (int i = (int)FbxLayerElement.EType.eTextureEmissive; i < (int)FbxLayerElement.EType.eTypeCount; i++)
{
#if UNI_19014
fbxSecondaryUVSet = fbxFirstUVLayer.GetUVs ((FbxLayerElement.EType)i);
#endif
if (fbxSecondaryUVSet != null)
fbxSecondaryUVSet = fbxFirstUVLayer.GetUVs ((FbxLayerElement.EType)i);

if (fbxSecondaryUVSet != null)
break;

if (fbxSecondaryUVSet!=null)
Expand Down Expand Up @@ -271,21 +264,16 @@ private void ProcessMesh (FbxNode fbxNode, GameObject unityGo)
/// </summary>
private void ProcessTransform (FbxNode fbxNode, GameObject unityGo)
{
FbxVector4 lclTrs = new FbxVector4 ();
FbxQuaternion lclRot = new FbxQuaternion ();
FbxVector4 lclScl = new FbxVector4 (1.0f, 1.0f, 1.0f);

#if UNI_18844
// Construct rotation matrices
FbxVector4 fbxRotation = new FbxVector4 (fbxNode.LclRotation.Get ());
FbxAMatrix fbxRotationM = new FbxAMatrix ();
fbxRotationM.SetR(fbxRotation);

FbxVector4 fbxPreRotation = new FbxVector4 (fbxNode.PreRotation.Get ());
FbxVector4 fbxPreRotation = new FbxVector4 (fbxNode.GetPreRotation(FbxNode.EPivotSet.eSourcePivot));
FbxAMatrix fbxPreRotationM = new FbxAMatrix ();
fbxPreRotationM.SetR(fbxPreRotation);

FbxVector4 fbxPostRotation = new FbxVector4 (fbxNode.PostRotation.Get ());
FbxVector4 fbxPostRotation = new FbxVector4 (fbxNode.GetPostRotation (FbxNode.EPivotSet.eSourcePivot));
FbxAMatrix fbxPostRotationM = new FbxAMatrix ();
fbxPostRotationM.SetR(fbxPostRotation);

Expand All @@ -301,19 +289,19 @@ private void ProcessTransform (FbxNode fbxNode, GameObject unityGo)

// Construct offset and pivot matrices
FbxAMatrix fbxRotationOffsetM = new FbxAMatrix ();
FbxVector4 fbxRotationOffset = fbxNode.RotationOffset.Get ();
FbxVector4 fbxRotationOffset = fbxNode.GetRotationOffset(FbxNode.EPivotSet.eSourcePivot);
fbxRotationOffsetM.SetT(fbxRotationOffset);

FbxAMatrix fbxRotationPivotM = new FbxAMatrix ();
FbxVector4 fbxRotationPivot = fbxNode.RotationPivot.Get ();
FbxVector4 fbxRotationPivot = fbxNode.GetRotationPivot(FbxNode.EPivotSet.eSourcePivot);
fbxRotationPivotM.SetT(fbxRotationPivot);

FbxAMatrix fbxScalingOffsetM = new FbxAMatrix ();
FbxVector4 fbxScalingOffset = fbxNode.ScalingOffset.Get ();
FbxVector4 fbxScalingOffset = fbxNode.GetScalingOffset (FbxNode.EPivotSet.eSourcePivot);
fbxScalingOffsetM.SetT(fbxScalingOffset);

FbxAMatrix fbxScalingPivotM = new FbxAMatrix ();
FbxVector4 fbxScalingPivot = fbxNode.ScalingPivot.Get ();
FbxVector4 fbxScalingPivot = fbxNode.GetScalingPivot (FbxNode.EPivotSet.eSourcePivot);
fbxScalingPivotM.SetT(fbxScalingPivot);

FbxAMatrix fbxTransform =
Expand All @@ -332,7 +320,6 @@ private void ProcessTransform (FbxNode fbxNode, GameObject unityGo)
FbxVector4 lclTrs = fbxTransform.GetT ();
FbxQuaternion lclRot = fbxTransform.GetQ ();
FbxVector4 lclScl = fbxTransform.GetS ();
#endif

Debug.Log (string.Format ("processing {3} Lcl : T({0}) R({1}) S({2})",
lclTrs.ToString (),
Expand Down Expand Up @@ -373,9 +360,7 @@ public void ProcessNode (FbxNode fbxNode, GameObject unityParentObj = null)
public void ConvertScene (FbxScene fbxScene, FbxSystemUnit toUnits)
{
// Get scale factor.
float scaleFactor = 1.0f;

scaleFactor = (float)fbxScene.GetGlobalSettings ().GetSystemUnit ().GetConversionFactorTo (toUnits);
double scaleFactor = (float)fbxScene.GetGlobalSettings ().GetSystemUnit ().GetConversionFactorTo (toUnits);

if (scaleFactor.Equals (1.0f))
return;
Expand All @@ -394,21 +379,20 @@ public void ConvertScene (FbxScene fbxScene, FbxSystemUnit toUnits)
// Convert node's translation.
FbxDouble3 lclTrs = fbxNode.LclTranslation.Get ();

#if UNI_18844
lclTrs *= scaleFactor;
lclTrs *= scaleFactor;
lclTrs *= scaleFactor;
#endif
lclTrs.X *= scaleFactor;
lclTrs.Y *= scaleFactor;
lclTrs.Z *= scaleFactor;

fbxNode.LclTranslation.Set (lclTrs);

FbxMesh fbxMesh = fbxNode.GetMesh ();

if (fbxMesh != null) {
for (int i = 0; i < fbxMesh.GetControlPointsCount (); ++i) {
FbxVector4 fbxVector4 = fbxMesh.GetControlPointAt (i);
#if UNI_18844

fbxVector4 *= scaleFactor;
#endif

fbxMesh.SetControlPointAt (fbxVector4, i);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/fbxaxissystem.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
eZAxis = 3, eZAxisDown = -3,
};
public enum EFrontVector {
eParityOdd = 1, eParityOddNegative = -1,
eParityEven = 2, eParityEvenNegative = -2,
eParityEven = 1, eParityEvenNegative = -1,
eParityOdd = 2, eParityOddNegative = -2,
};
%}
EUpVector GetUpVector() {
Expand Down
2 changes: 2 additions & 0 deletions tests/UnityTests/Assets/Editor/UseCaseTests/SkinnedMeshExportTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ protected override void CheckScene (FbxScene scene)
// to FbxSkin, or so that it just returns the correct type.
// Check that the mesh is correctly linked to the skeleton
//CheckMeshLinkedToSkeleton(origMeshNode.GetMesh(), importMeshNode.GetMesh());
origMeshNode.GetMesh();
importMeshNode.GetMesh ();

// Check that bind pose is set correctly
CheckExportBindPose(origScene, scene);
Expand Down

0 comments on commit 8b385c8

Please sign in to comment.