Skip to content

Commit ce0b734

Browse files
authored
Merge pull request #464 from Unity-Technologies/UT-1825-add-nested-prefab-conversion
Ut 1825 add nested prefab conversion
2 parents e7f40ae + fa36974 commit ce0b734

File tree

64 files changed

+10221
-4207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+10221
-4207
lines changed

com.unity.formats.fbx.tests/Tests/FbxTests/ConvertToModelTest.cs

Lines changed: 378 additions & 215 deletions
Large diffs are not rendered by default.

com.unity.formats.fbx.tests/Tests/FbxTests/FbxPrefabAutoUpdaterTest.cs

Lines changed: 0 additions & 435 deletions
This file was deleted.

com.unity.formats.fbx.tests/Tests/FbxTests/FbxPrefabTest.cs

Lines changed: 0 additions & 704 deletions
This file was deleted.

com.unity.formats.fbx.tests/Tests/FbxTests/FbxPrefabTest.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

com.unity.formats.fbx.tests/Tests/Prefabs.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &9136261842497285268
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 6408776321584849730}
12+
- component: {fileID: 6211156637428417875}
13+
- component: {fileID: 7419634601289702452}
14+
m_Layer: 0
15+
m_Name: Camera
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &6408776321584849730
22+
Transform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 9136261842497285268}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: -1.958}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!20 &6211156637428417875
36+
Camera:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 9136261842497285268}
42+
m_Enabled: 1
43+
serializedVersion: 2
44+
m_ClearFlags: 1
45+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
46+
m_projectionMatrixMode: 2
47+
m_GateFitMode: 2
48+
m_FOVAxisMode: 0
49+
m_SensorSize: {x: 36, y: 24}
50+
m_LensShift: {x: 0, y: 0}
51+
m_FocalLength: 50
52+
m_NormalizedViewPortRect:
53+
serializedVersion: 2
54+
x: 0
55+
y: 0
56+
width: 1
57+
height: 1
58+
near clip plane: 0.3
59+
far clip plane: 1000
60+
field of view: 26.991467
61+
orthographic: 0
62+
orthographic size: 5
63+
m_Depth: 0
64+
m_CullingMask:
65+
serializedVersion: 2
66+
m_Bits: 4294967295
67+
m_RenderingPath: -1
68+
m_TargetTexture: {fileID: 0}
69+
m_TargetDisplay: 0
70+
m_TargetEye: 3
71+
m_HDR: 1
72+
m_AllowMSAA: 1
73+
m_AllowDynamicResolution: 0
74+
m_ForceIntoRT: 0
75+
m_OcclusionCulling: 1
76+
m_StereoConvergence: 10
77+
m_StereoSeparation: 0.022
78+
--- !u!81 &7419634601289702452
79+
AudioListener:
80+
m_ObjectHideFlags: 0
81+
m_CorrespondingSourceObject: {fileID: 0}
82+
m_PrefabInstance: {fileID: 0}
83+
m_PrefabAsset: {fileID: 0}
84+
m_GameObject: {fileID: 9136261842497285268}
85+
m_Enabled: 1

com.unity.formats.fbx.tests/Tests/Prefabs/Camera.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.unity.formats.fbx.tests/Tests/Prefabs/Capsule.fbx

Lines changed: 620 additions & 0 deletions
Large diffs are not rendered by default.

com.unity.formats.fbx.tests/Tests/Prefabs/Capsule.fbx.meta

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)