diff --git a/Unity/Assets/Meshes.unity b/Unity/Assets/Meshes.unity index 2ac64d8..3a744bc 100644 --- a/Unity/Assets/Meshes.unity +++ b/Unity/Assets/Meshes.unity @@ -163,6 +163,48 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 6d541b7ab63d87644abd4cab4df15985, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &402788010 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4686852607370020, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 421802f091239ce43bdf8d69e4f258ee, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &451395386 Prefab: m_ObjectHideFlags: 0 diff --git a/Unity/Assets/OBJ_MetalChairB.prefab b/Unity/Assets/OBJ_MetalChairB.prefab index bb3ca15..994d8c6 100644 --- a/Unity/Assets/OBJ_MetalChairB.prefab +++ b/Unity/Assets/OBJ_MetalChairB.prefab @@ -56,9 +56,10 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 m_Materials: - {fileID: 0} - {fileID: 0} @@ -72,6 +73,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Unity/Assets/Obj_BenchD.prefab b/Unity/Assets/Obj_BenchD.prefab new file mode 100644 index 0000000..8f6d166 --- /dev/null +++ b/Unity/Assets/Obj_BenchD.prefab @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1495228728210698} + m_IsPrefabParent: 1 +--- !u!1 &1495228728210698 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4686852607370020} + - component: {fileID: 33013643558822846} + - component: {fileID: 23946367419950868} + - component: {fileID: 65267475070804304} + m_Layer: 0 + m_Name: Obj_BenchD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4686852607370020 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1495228728210698} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23946367419950868 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1495228728210698} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33013643558822846 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1495228728210698} + m_Mesh: {fileID: 4300000, guid: d2c78cd678e0ce9449ebc171f291defc, type: 3} +--- !u!65 &65267475070804304 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1495228728210698} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.43678272, y: 0.50208735, z: 0.3630867} + m_Center: {x: 0.0009286478, y: 0.2618516, z: 0.0019055456} diff --git a/Unity/Assets/Obj_BenchD.prefab.meta b/Unity/Assets/Obj_BenchD.prefab.meta new file mode 100644 index 0000000..35ab08c --- /dev/null +++ b/Unity/Assets/Obj_BenchD.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 421802f091239ce43bdf8d69e4f258ee +timeCreated: 1525080286 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: better-placing.unity3d + assetBundleVariant: diff --git a/Unity/Assets/Obj_ChairWoodB.prefab b/Unity/Assets/Obj_ChairWoodB.prefab index 30759bb..e0032c9 100644 --- a/Unity/Assets/Obj_ChairWoodB.prefab +++ b/Unity/Assets/Obj_ChairWoodB.prefab @@ -55,9 +55,10 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 m_Materials: - {fileID: 0} m_StaticBatchInfo: @@ -70,6 +71,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Unity/Assets/models/Materials.meta b/Unity/Assets/models/Materials.meta new file mode 100644 index 0000000..02b2182 --- /dev/null +++ b/Unity/Assets/models/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fcc94ce86b7785a42a8639d5af3196b7 +folderAsset: yes +timeCreated: 1525071357 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Materials/Material.mat b/Unity/Assets/models/Materials/Material.mat new file mode 100644 index 0000000..cea20b4 --- /dev/null +++ b/Unity/Assets/models/Materials/Material.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity/Assets/models/Materials/Material.mat.meta b/Unity/Assets/models/Materials/Material.mat.meta new file mode 100644 index 0000000..154af35 --- /dev/null +++ b/Unity/Assets/models/Materials/Material.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6b165b49d9da3284090669e05132cb28 +timeCreated: 1525071417 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Materials/Material_001.mat b/Unity/Assets/models/Materials/Material_001.mat new file mode 100644 index 0000000..4ef38cc --- /dev/null +++ b/Unity/Assets/models/Materials/Material_001.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Material_001 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity/Assets/models/Materials/Material_001.mat.meta b/Unity/Assets/models/Materials/Material_001.mat.meta new file mode 100644 index 0000000..932d40d --- /dev/null +++ b/Unity/Assets/models/Materials/Material_001.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4cfc2b01be5e4b74eb964c6dfcd5160e +timeCreated: 1525071417 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Materials/Obj_BenchD_0Mat.mat b/Unity/Assets/models/Materials/Obj_BenchD_0Mat.mat new file mode 100644 index 0000000..69787f9 --- /dev/null +++ b/Unity/Assets/models/Materials/Obj_BenchD_0Mat.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Obj_BenchD_0Mat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity/Assets/models/Materials/Obj_BenchD_0Mat.mat.meta b/Unity/Assets/models/Materials/Obj_BenchD_0Mat.mat.meta new file mode 100644 index 0000000..a1980dd --- /dev/null +++ b/Unity/Assets/models/Materials/Obj_BenchD_0Mat.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: da570ecdf8da23648a1a922abadf89d4 +timeCreated: 1525080170 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Materials/Obj_ChairA_Cin_LOD0Mat.mat b/Unity/Assets/models/Materials/Obj_ChairA_Cin_LOD0Mat.mat new file mode 100644 index 0000000..de579b0 --- /dev/null +++ b/Unity/Assets/models/Materials/Obj_ChairA_Cin_LOD0Mat.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Obj_ChairA_Cin_LOD0Mat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity/Assets/models/Materials/Obj_ChairA_Cin_LOD0Mat.mat.meta b/Unity/Assets/models/Materials/Obj_ChairA_Cin_LOD0Mat.mat.meta new file mode 100644 index 0000000..82a8ea5 --- /dev/null +++ b/Unity/Assets/models/Materials/Obj_ChairA_Cin_LOD0Mat.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a9330fa5d268d2e4cb1a705e1db3b44c +timeCreated: 1525071357 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Materials/Obj_ChairWoodBMat.mat b/Unity/Assets/models/Materials/Obj_ChairWoodBMat.mat new file mode 100644 index 0000000..550dbc5 --- /dev/null +++ b/Unity/Assets/models/Materials/Obj_ChairWoodBMat.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Obj_ChairWoodBMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity/Assets/models/Materials/Obj_ChairWoodBMat.mat.meta b/Unity/Assets/models/Materials/Obj_ChairWoodBMat.mat.meta new file mode 100644 index 0000000..ceeb465 --- /dev/null +++ b/Unity/Assets/models/Materials/Obj_ChairWoodBMat.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fe4036e682616ba4cb9c6f7e164fd894 +timeCreated: 1525071398 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Materials/unnamed.mat b/Unity/Assets/models/Materials/unnamed.mat new file mode 100644 index 0000000..74d481a --- /dev/null +++ b/Unity/Assets/models/Materials/unnamed.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: unnamed + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity/Assets/models/Materials/unnamed.mat.meta b/Unity/Assets/models/Materials/unnamed.mat.meta new file mode 100644 index 0000000..a299677 --- /dev/null +++ b/Unity/Assets/models/Materials/unnamed.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e3c64683640a8ed4090a9e583c5bef98 +timeCreated: 1525071404 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/OBJ_CushionedChairA.fbx.meta b/Unity/Assets/models/OBJ_CushionedChairA.fbx.meta index fd28354..3111e7c 100644 --- a/Unity/Assets/models/OBJ_CushionedChairA.fbx.meta +++ b/Unity/Assets/models/OBJ_CushionedChairA.fbx.meta @@ -3,17 +3,24 @@ guid: 00fc47f593aaee041b368872c864e2a2 timeCreated: 1509820217 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: CushionedChairAMesh + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: unnamed + second: {fileID: 2100000, guid: 998c25b25ed6cac4587055663e8382d7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +33,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +67,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_CushionedChairB.fbx.meta b/Unity/Assets/models/OBJ_CushionedChairB.fbx.meta index 0b4ba33..5df33f6 100644 --- a/Unity/Assets/models/OBJ_CushionedChairB.fbx.meta +++ b/Unity/Assets/models/OBJ_CushionedChairB.fbx.meta @@ -3,17 +3,24 @@ guid: aa49095e74ef79f4483f4838778bbdf6 timeCreated: 1509820297 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: CushionedChairBMesh + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: unnamed + second: {fileID: 2100000, guid: 998c25b25ed6cac4587055663e8382d7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +33,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +67,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_CushionedChairC.fbx.meta b/Unity/Assets/models/OBJ_CushionedChairC.fbx.meta index 3987f0b..f026dc9 100644 --- a/Unity/Assets/models/OBJ_CushionedChairC.fbx.meta +++ b/Unity/Assets/models/OBJ_CushionedChairC.fbx.meta @@ -3,17 +3,24 @@ guid: 4853d52f5f5523a47ad2cb3bd0935f22 timeCreated: 1509820508 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: CushionedChairCMesh + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: unnamed + second: {fileID: 2100000, guid: 998c25b25ed6cac4587055663e8382d7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +33,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +67,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_MetalChairA.fbx.meta b/Unity/Assets/models/OBJ_MetalChairA.fbx.meta index 6ead4b4..d35bf1c 100644 --- a/Unity/Assets/models/OBJ_MetalChairA.fbx.meta +++ b/Unity/Assets/models/OBJ_MetalChairA.fbx.meta @@ -3,17 +3,29 @@ guid: 36dd366faf73ce0479df9ff7dae3a6c8 timeCreated: 1509953561 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: OBJ_MetalChairA + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: 1b53256197ad2d9419fde4712395d4bd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material_001 + second: {fileID: 2100000, guid: 2d1d71aa26c796040bfac3eb50a725c7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +38,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +72,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_MetalChairB.fbx.meta b/Unity/Assets/models/OBJ_MetalChairB.fbx.meta index c7e39e1..0ad0a0b 100644 --- a/Unity/Assets/models/OBJ_MetalChairB.fbx.meta +++ b/Unity/Assets/models/OBJ_MetalChairB.fbx.meta @@ -3,17 +3,29 @@ guid: 3d79660897451514cb5dec0863f60176 timeCreated: 1509953308 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: OBJ_MetalChairB + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: 1b53256197ad2d9419fde4712395d4bd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material_001 + second: {fileID: 2100000, guid: 2d1d71aa26c796040bfac3eb50a725c7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +38,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +72,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_MetalChairC.fbx.meta b/Unity/Assets/models/OBJ_MetalChairC.fbx.meta index d3da26c..7c44bbe 100644 --- a/Unity/Assets/models/OBJ_MetalChairC.fbx.meta +++ b/Unity/Assets/models/OBJ_MetalChairC.fbx.meta @@ -3,17 +3,29 @@ guid: 7e8023529bfba83459621b033760d282 timeCreated: 1509953095 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: OBJ_MetalChairC + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: 1b53256197ad2d9419fde4712395d4bd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material_001 + second: {fileID: 2100000, guid: 2d1d71aa26c796040bfac3eb50a725c7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +38,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +72,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_MetalChairD.fbx.meta b/Unity/Assets/models/OBJ_MetalChairD.fbx.meta index 5c04ecb..74c1490 100644 --- a/Unity/Assets/models/OBJ_MetalChairD.fbx.meta +++ b/Unity/Assets/models/OBJ_MetalChairD.fbx.meta @@ -3,17 +3,29 @@ guid: 2e1956ab23294dc4a99a189475fdf8a3 timeCreated: 1509913672 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: OBJ_MetalChairD + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: 1b53256197ad2d9419fde4712395d4bd, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material_001 + second: {fileID: 2100000, guid: 2d1d71aa26c796040bfac3eb50a725c7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -26,20 +38,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -55,6 +72,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/OBJ_WoodChairA.fbx.meta b/Unity/Assets/models/OBJ_WoodChairA.fbx.meta index 92d6664..5360ffe 100644 --- a/Unity/Assets/models/OBJ_WoodChairA.fbx.meta +++ b/Unity/Assets/models/OBJ_WoodChairA.fbx.meta @@ -3,7 +3,7 @@ guid: 230e7330ed96be34485ccb38ed82a682 timeCreated: 1509533009 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: Camera 100002: Lamp @@ -18,10 +18,17 @@ ModelImporter: 3300000: WoodChairAMesh 3300002: //RootNode 4300000: WoodChairAMesh + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: unnamed + second: {fileID: 2100000, guid: 998c25b25ed6cac4587055663e8382d7, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -34,20 +41,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + importVisibility: 0 importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -63,6 +75,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/Obj_BenchD.obj b/Unity/Assets/models/Obj_BenchD.obj new file mode 100644 index 0000000..c756e4b --- /dev/null +++ b/Unity/Assets/models/Obj_BenchD.obj @@ -0,0 +1,1773 @@ +g Obj_BenchD +v -0.2003102 0.5066617 -0.1782342 +v -0.2041458 0.4867631 0.006743089 +v -0.2006934 0.4867643 -0.1796378 +v -0.2031545 0.5102118 0.0119085 +v -0.2012795 0.4867625 0.1183793 +v -0.2002716 0.5071504 0.1224639 +v -0.2007434 0.4867622 0.1791416 +v 0.2057101 0.4867615 0.04091081 +v 0.2013673 0.5090353 -0.1766208 +v 0.2007705 0.4867629 -0.1787716 +v 0.2013673 0.5090353 -0.1766208 +v 0.2057101 0.4867615 0.04091081 +v 0.2031631 0.5128953 0.04560608 +v -0.0557403 0.4867632 -0.173201 +v -0.2003102 0.5066617 -0.1782342 +v -0.2006934 0.4867643 -0.1796378 +v -0.2003102 0.5066617 -0.1782342 +v -0.0557403 0.4867632 -0.173201 +v -0.05526491 0.5063415 -0.1707768 +v -0.05526491 0.5063415 -0.1707768 +v -0.2031545 0.5102118 0.0119085 +v -0.2003102 0.5066617 -0.1782342 +v 0.03835895 0.5109509 0.03219419 +v 0.2013673 0.5090353 -0.1766208 +v 0.2031631 0.5128953 0.04560608 +v -0.2002716 0.5071504 0.1224639 +v 0.07168901 0.5109469 0.1057096 +v -0.2013657 0.5102026 0.1813202 +v 0.1043464 0.5101899 0.1780285 +v 0.2003767 0.5101905 0.09733498 +v 0.2019313 0.5100353 0.1797919 +v 0.1043464 0.5101899 0.1780285 +v -0.2007434 0.4867622 0.1791416 +v -0.2013657 0.5102026 0.1813202 +v -0.2007434 0.4867622 0.1791416 +v 0.1043464 0.5101899 0.1780285 +v 0.1040983 0.4867609 0.1785834 +v 0.2007063 0.4867607 0.1797818 +v 0.2019313 0.5100353 0.1797919 +v -0.0557403 0.4867632 -0.173201 +v 0.2013673 0.5090353 -0.1766208 +v -0.05526491 0.5063415 -0.1707768 +v 0.2007705 0.4867629 -0.1787716 +v -0.2007434 0.4867622 0.1791416 +v -0.2002716 0.5071504 0.1224639 +v -0.2013657 0.5102026 0.1813202 +v 0.2007063 0.4867607 0.1797818 +v 0.2003767 0.5101905 0.09733498 +v 0.2008928 0.4867613 0.09343003 +v 0.2003767 0.5101905 0.09733498 +v 0.2007063 0.4867607 0.1797818 +v 0.2019313 0.5100353 0.1797919 +v 0.2008928 0.4867613 0.09343003 +v 0.2031631 0.5128953 0.04560608 +v 0.2057101 0.4867615 0.04091081 +v 0.2031631 0.5128953 0.04560608 +v 0.2008928 0.4867613 0.09343003 +v 0.2003767 0.5101905 0.09733498 +v 0.1040983 0.4867609 0.1785834 +v -0.2012795 0.4867625 0.1183793 +v -0.2007434 0.4867622 0.1791416 +v -0.2041458 0.4867631 0.006743089 +v 0.03508148 0.4867621 0.02668631 +v -0.0557403 0.4867632 -0.173201 +v -0.2006934 0.4867643 -0.1796378 +v 0.2007705 0.4867629 -0.1787716 +v 0.2057101 0.4867615 0.04091081 +v 0.2008928 0.4867613 0.09343003 +v 0.2007063 0.4867607 0.1797818 +v 0.1424854 0.06016603 0.0899472 +v 0.1428942 0.01135917 0.1589188 +v 0.1429003 0.01151569 0.09036323 +v 0.1424793 0.07138269 0.1539585 +v 0.1424854 0.2232476 0.08994815 +v 0.1424792 0.2294104 0.1593336 +v 0.1424854 0.2507457 0.08994829 +v 0.1424792 0.2588072 0.1552368 +v 0.1428502 0.4677962 0.09031568 +v 0.1428417 0.4672213 0.1584549 +v 0.1428941 0.497405 0.158921 +v 0.1429002 0.4975592 0.09036607 +v 0.1915398 0.01122441 0.1590403 +v 0.1919625 0.05624186 0.09011508 +v 0.1915476 0.01138097 0.0905283 +v 0.1919546 0.06745152 0.1540821 +v 0.1942639 0.2223738 0.09011604 +v 0.194256 0.2285327 0.1594572 +v 0.1919625 0.2512789 0.0901162 +v 0.1919546 0.2593353 0.1587479 +v 0.1915956 0.4688832 0.09048303 +v 0.1915902 0.4683051 0.1590066 +v 0.1915397 0.4972704 0.1590425 +v 0.1915475 0.4974245 0.09053113 +v 0.1919625 0.05624186 0.09011508 +v 0.1429003 0.01151569 0.09036323 +v 0.1915476 0.01138097 0.0905283 +v 0.1424854 0.06016603 0.0899472 +v 0.1942639 0.2223738 0.09011604 +v 0.1424854 0.2232476 0.08994815 +v 0.1424854 0.2507457 0.08994829 +v 0.1919625 0.2512789 0.0901162 +v 0.1428502 0.4677962 0.09031568 +v 0.1915956 0.4688832 0.09048303 +v 0.1429002 0.4975592 0.09036607 +v 0.1915475 0.4974245 0.09053113 +v 0.1919546 0.2593353 0.1587479 +v 0.1428417 0.4672213 0.1584549 +v 0.1915902 0.4683051 0.1590066 +v 0.1424792 0.2588072 0.1552368 +v 0.1424792 0.2294104 0.1593336 +v 0.194256 0.2285327 0.1594572 +v 0.1424793 0.07138269 0.1539585 +v 0.1919546 0.06745152 0.1540821 +v 0.1428942 0.01135917 0.1589188 +v 0.1915398 0.01122441 0.1590403 +v 0.1428941 0.497405 0.158921 +v 0.1915397 0.4972704 0.1590425 +v 0.1915476 0.01138097 0.0905283 +v 0.1428942 0.01135917 0.1589188 +v 0.1915398 0.01122441 0.1590403 +v 0.1429003 0.01151569 0.09036323 +v -0.1557834 0.1942769 0.1054906 +v -0.1035887 0.1431695 0.1054352 +v -0.1030356 0.1934199 0.1054336 +v -0.1557828 0.1432394 0.1054892 +v 0.05673526 0.1908241 0.1052612 +v 0.06347609 0.1429458 0.1052622 +v 0.1192969 0.1931651 0.1054898 +v 0.1202815 0.1431313 0.1054847 +v 0.1485932 0.1432239 0.1055955 +v 0.1485927 0.1942614 0.1055969 +v -0.1557834 0.1942769 0.1054906 +v -0.1028376 0.1933727 0.1459505 +v -0.1558191 0.1942602 0.1467664 +v -0.1030356 0.1934199 0.1054336 +v 0.05027373 0.1908076 0.1435926 +v 0.05673526 0.1908241 0.1052612 +v -0.1033902 0.1431502 0.145984 +v -0.1558191 0.1942602 0.1467664 +v -0.1028376 0.1933727 0.1459505 +v -0.1558185 0.1432225 0.1467654 +v 0.05027373 0.1908076 0.1435926 +v 0.05701464 0.142929 0.1435934 +v -0.1557828 0.1432394 0.1054892 +v -0.1033902 0.1431502 0.145984 +v -0.1035887 0.1431695 0.1054352 +v -0.1558185 0.1432225 0.1467654 +v 0.05701464 0.142929 0.1435934 +v 0.06347609 0.1429458 0.1052622 +v 0.119673 0.1431193 0.1458184 +v 0.1202815 0.1431313 0.1054847 +v 0.1485932 0.1432239 0.1055955 +v 0.1485474 0.1432069 0.1468437 +v 0.1424489 0.01094515 -0.09672268 +v 0.1423323 0.05534363 -0.1645341 +v 0.1423267 0.05563133 -0.09660063 +v 0.1424551 0.01110373 -0.1661691 +v 0.1421515 0.1204648 -0.1621273 +v 0.1421453 0.1220102 -0.09641933 +v 0.1424258 0.469364 -0.09669768 +v 0.1424325 0.4699477 -0.1658664 +v 0.1424488 0.4978198 -0.09672047 +v 0.142455 0.497976 -0.1661664 +v 0.1937291 0.1461171 -0.161957 +v 0.192527 0.05353659 -0.09650368 +v 0.1937211 0.1476607 -0.09629391 +v 0.1925361 0.05324749 -0.1647359 +v 0.191985 0.01080792 -0.09659891 +v 0.1919929 0.01096653 -0.1660011 +v 0.192125 0.4710557 -0.1656905 +v 0.1921198 0.4704726 -0.09657317 +v 0.1919849 0.4976828 -0.0965967 +v 0.1919928 0.497839 -0.1659983 +v 0.1421515 0.1204648 -0.1621273 +v 0.1925361 0.05324749 -0.1647359 +v 0.1937291 0.1461171 -0.161957 +v 0.1423323 0.05534363 -0.1645341 +v 0.1424551 0.01110373 -0.1661691 +v 0.1919929 0.01096653 -0.1660011 +v 0.1424325 0.4699477 -0.1658664 +v 0.192125 0.4710557 -0.1656905 +v 0.142455 0.497976 -0.1661664 +v 0.1919928 0.497839 -0.1659983 +v 0.1424488 0.4978198 -0.09672047 +v 0.1921198 0.4704726 -0.09657317 +v 0.1424258 0.469364 -0.09669768 +v 0.1919849 0.4976828 -0.0965967 +v 0.1937211 0.1476607 -0.09629391 +v 0.1421453 0.1220102 -0.09641933 +v 0.192527 0.05353659 -0.09650368 +v 0.1423267 0.05563133 -0.09660063 +v 0.1424489 0.01094515 -0.09672268 +v 0.191985 0.01080792 -0.09659891 +v 0.1919929 0.01096653 -0.1660011 +v 0.1424489 0.01094515 -0.09672268 +v 0.191985 0.01080792 -0.09659891 +v 0.1424551 0.01110373 -0.1661691 +v -0.1893959 0.013728 0.183323 +v -0.1893898 0.07031075 0.1007213 +v -0.189396 0.07066055 0.1833233 +v -0.1893898 0.01388682 0.100721 +v -0.189396 0.4595931 0.1833251 +v -0.1893898 0.46029 0.1007236 +v -0.189396 0.4849051 0.1833252 +v -0.1893899 0.4850611 0.1007238 +v -0.139852 0.06824397 0.1008894 +v -0.1398599 0.01359074 0.1834467 +v -0.1398599 0.06859367 0.183447 +v -0.139852 0.01374963 0.1008891 +v -0.139852 0.4613946 0.1008917 +v -0.13986 0.4606982 0.1834488 +v -0.139852 0.4849241 0.1008919 +v -0.13986 0.484768 0.1834489 +v -0.1893898 0.01388682 0.100721 +v -0.139852 0.06824397 0.1008894 +v -0.1893898 0.07031075 0.1007213 +v -0.139852 0.01374963 0.1008891 +v -0.1893898 0.46029 0.1007236 +v -0.139852 0.4613946 0.1008917 +v -0.1893899 0.4850611 0.1007238 +v -0.139852 0.4849241 0.1008919 +v -0.13986 0.484768 0.1834489 +v -0.1893899 0.4850611 0.1007238 +v -0.139852 0.4849241 0.1008919 +v -0.189396 0.4849051 0.1833252 +v -0.189396 0.4849051 0.1833252 +v -0.13986 0.4606982 0.1834488 +v -0.189396 0.4595931 0.1833251 +v -0.13986 0.484768 0.1834489 +v -0.189396 0.07066055 0.1833233 +v -0.1398599 0.06859367 0.183447 +v -0.1893959 0.013728 0.183323 +v -0.1398599 0.01359074 0.1834467 +v -0.139852 0.01374963 0.1008891 +v -0.1893959 0.013728 0.183323 +v -0.1398599 0.01359074 0.1834467 +v -0.1893898 0.01388682 0.100721 +v -0.1557832 0.1942771 -0.1481721 +v -0.1048306 0.1432371 -0.1481528 +v -0.1042688 0.1942745 -0.148151 +v -0.1557827 0.1432397 -0.1481736 +v 0.1231019 0.1942629 -0.1480581 +v 0.1241063 0.1432254 -0.1480593 +v 0.1485929 0.1942616 -0.1480477 +v 0.1485935 0.1432241 -0.1480493 +v -0.1558193 0.1942604 -0.09949703 +v -0.1042688 0.1942745 -0.148151 +v -0.1040305 0.1942578 -0.09948146 +v -0.1557832 0.1942771 -0.1481721 +v 0.1223681 0.1942463 -0.09941336 +v 0.1231019 0.1942629 -0.1480581 +v 0.1485467 0.1942449 -0.09940549 +v 0.1485929 0.1942616 -0.1480477 +v -0.1558193 0.1942604 -0.09949703 +v -0.1045923 0.14322 -0.09948277 +v -0.1558187 0.1432227 -0.09949818 +v -0.1040305 0.1942578 -0.09948146 +v 0.1233724 0.1432084 -0.09941418 +v 0.1223681 0.1942463 -0.09941336 +v 0.1485467 0.1942449 -0.09940549 +v 0.1485472 0.1432071 -0.09940661 +v -0.1557827 0.1432397 -0.1481736 +v -0.1045923 0.14322 -0.09948277 +v -0.1048306 0.1432371 -0.1481528 +v -0.1558187 0.1432227 -0.09949818 +v 0.1241063 0.1432254 -0.1480593 +v 0.1233724 0.1432084 -0.09941418 +v 0.1485472 0.1432071 -0.09940661 +v 0.1485935 0.1432241 -0.1480493 +v -0.1893966 0.08230904 -0.1664733 +v -0.1893959 0.01094515 -0.09672268 +v -0.1893898 0.01110377 -0.1681521 +v -0.1894029 0.09006112 -0.09641943 +v -0.1932068 0.1627041 -0.161753 +v -0.193213 0.1767473 -0.09641908 +v -0.1398599 0.01080792 -0.09659891 +v -0.1395483 0.07839783 -0.1663032 +v -0.139852 0.01096657 -0.167984 +v -0.1395563 0.08614511 -0.09629421 +v -0.1395483 0.165479 -0.1615829 +v -0.1395563 0.1795129 -0.09629381 +v -0.1398208 0.4636426 -0.1655439 +v -0.1398269 0.4630606 -0.09656375 +v -0.13986 0.4976828 -0.0965967 +v -0.139852 0.497839 -0.1659983 +v -0.1395483 0.07839783 -0.1663032 +v -0.1893898 0.01110377 -0.1681521 +v -0.139852 0.01096657 -0.167984 +v -0.1893966 0.08230904 -0.1664733 +v -0.1395483 0.165479 -0.1615829 +v -0.1932068 0.1627041 -0.161753 +v -0.189396 0.4978198 -0.09672047 +v -0.1398269 0.4630606 -0.09656375 +v -0.1898225 0.4619453 -0.09668681 +v -0.13986 0.4976828 -0.0965967 +v -0.1395563 0.1795129 -0.09629381 +v -0.193213 0.1767473 -0.09641908 +v -0.1894029 0.09006112 -0.09641943 +v -0.1395563 0.08614511 -0.09629421 +v -0.1893959 0.01094515 -0.09672268 +v -0.1398599 0.01080792 -0.09659891 +v -0.139852 0.01096657 -0.167984 +v -0.1893959 0.01094515 -0.09672268 +v -0.1398599 0.01080792 -0.09659891 +v -0.1893898 0.01110377 -0.1681521 +v -0.193213 0.1767473 -0.09641908 +v -0.1897934 0.4625281 -0.1656997 +v -0.1898225 0.4619453 -0.09668681 +v -0.1932068 0.1627041 -0.161753 +v -0.189396 0.4978198 -0.09672047 +v -0.1893899 0.497976 -0.1661664 +v -0.1893899 0.497976 -0.1661664 +v -0.1398208 0.4636426 -0.1655439 +v -0.139852 0.497839 -0.1659983 +v -0.1897934 0.4625281 -0.1656997 +v -0.1395483 0.165479 -0.1615829 +v -0.1932068 0.1627041 -0.161753 +v 0.1485927 0.1942614 0.1055969 +v 0.1186869 0.1932003 0.1458566 +v 0.1192969 0.1931651 0.1054898 +v 0.1485468 0.1942447 0.1468447 +v 0.05673526 0.1908241 0.1052612 +v 0.05027373 0.1908076 0.1435926 +v 0.05701464 0.142929 0.1435934 +v 0.1186869 0.1932003 0.1458566 +v 0.119673 0.1431193 0.1458184 +v 0.05027373 0.1908076 0.1435926 +v 0.1485474 0.1432069 0.1468437 +v 0.1485468 0.1942447 0.1468447 +v 0.1890725 0.3242581 0.149101 +v 0.1890778 0.2584455 -0.129907 +v 0.1890777 0.324276 -0.1298982 +v 0.1890726 0.2584275 0.1490946 +v 0.2174559 0.3242434 0.1495807 +v 0.2174627 0.2584307 -0.1292555 +v 0.217456 0.2584128 0.1495742 +v 0.2174626 0.3242613 -0.1292467 +v 0.2174626 0.3242613 -0.1292467 +v 0.1890778 0.2584455 -0.129907 +v 0.2174627 0.2584307 -0.1292555 +v 0.1890777 0.324276 -0.1298982 +v 0.2174559 0.3242434 0.1495807 +v 0.1890777 0.324276 -0.1298982 +v 0.2174626 0.3242613 -0.1292467 +v 0.1890725 0.3242581 0.149101 +v 0.217456 0.2584128 0.1495742 +v 0.1890725 0.3242581 0.149101 +v 0.2174559 0.3242434 0.1495807 +v 0.1890726 0.2584275 0.1490946 +v 0.2174627 0.2584307 -0.1292555 +v 0.1890726 0.2584275 0.1490946 +v 0.217456 0.2584128 0.1495742 +v 0.1890778 0.2584455 -0.129907 +v -0.04396296 0.1478908 0.1287694 +v -0.0439526 0.09687098 -0.1230807 +v -0.04395278 0.1479084 -0.1230723 +v -0.04396283 0.0968531 0.1287633 +v 0.03732219 0.1478755 0.1292391 +v 0.03733546 0.09685574 -0.1224428 +v 0.03732232 0.09683786 0.1292329 +v 0.03733533 0.1478932 -0.1224344 +v 0.03733533 0.1478932 -0.1224344 +v -0.0439526 0.09687098 -0.1230807 +v 0.03733546 0.09685574 -0.1224428 +v -0.04395278 0.1479084 -0.1230723 +v 0.03732219 0.1478755 0.1292391 +v -0.04395278 0.1479084 -0.1230723 +v 0.03733533 0.1478932 -0.1224344 +v -0.04396296 0.1478908 0.1287694 +v 0.03732232 0.09683786 0.1292329 +v -0.04396296 0.1478908 0.1287694 +v 0.03732219 0.1478755 0.1292391 +v -0.04396283 0.0968531 0.1287633 +v 0.03733546 0.09685574 -0.1224428 +v -0.04396283 0.0968531 0.1287633 +v 0.03732232 0.09683786 0.1292329 +v -0.0439526 0.09687098 -0.1230807 +v -0.1557833 0.4816583 0.1158458 +v -0.1003736 0.430618 0.1158654 +v -0.09981176 0.4816555 0.1158671 +v -0.1557827 0.4306209 0.1158443 +v 0.1134624 0.4816446 0.1159483 +v 0.1144667 0.4306071 0.1159472 +v 0.1485928 0.4816428 0.1159616 +v 0.1485934 0.4306053 0.1159601 +v -0.1558192 0.4816415 0.154999 +v -0.09981176 0.4816555 0.1158671 +v -0.09962011 0.4816386 0.1550148 +v -0.1557833 0.4816583 0.1158458 +v 0.1128722 0.4816278 0.1550743 +v 0.1134624 0.4816446 0.1159483 +v 0.1485467 0.481626 0.1550843 +v 0.1485928 0.4816428 0.1159616 +v -0.1558192 0.4816415 0.154999 +v -0.1001819 0.430601 0.1550135 +v -0.1558186 0.4306038 0.1549979 +v -0.09962011 0.4816386 0.1550148 +v 0.1138766 0.43059 0.1550735 +v 0.1128722 0.4816278 0.1550743 +v 0.1485467 0.481626 0.1550843 +v 0.1485473 0.4305882 0.1550832 +v -0.1557827 0.4306209 0.1158443 +v -0.1001819 0.430601 0.1550135 +v -0.1003736 0.430618 0.1158654 +v -0.1558186 0.4306038 0.1549979 +v 0.1144667 0.4306071 0.1159472 +v 0.1138766 0.43059 0.1550735 +v 0.1485473 0.4305882 0.1550832 +v 0.1485934 0.4306053 0.1159601 +v -0.1557833 0.4816586 -0.1556585 +v -0.1017039 0.4306183 -0.1556394 +v -0.1011421 0.4816558 -0.1556377 +v -0.1557827 0.4306211 -0.15566 +v 0.11756 0.4816446 -0.1555545 +v 0.1185643 0.4306071 -0.1555556 +v 0.1485928 0.481643 -0.1555427 +v 0.1485934 0.4306055 -0.1555442 +v -0.1558192 0.4816417 -0.1104834 +v -0.1011421 0.4816558 -0.1556377 +v -0.100921 0.4816389 -0.1104681 +v -0.1557833 0.4816586 -0.1556585 +v 0.1168789 0.4816278 -0.110407 +v 0.11756 0.4816446 -0.1555545 +v 0.1485467 0.4816262 -0.1103982 +v 0.1485928 0.481643 -0.1555427 +v -0.1558192 0.4816417 -0.1104834 +v -0.1014828 0.4306012 -0.1104693 +v -0.1558186 0.430604 -0.1104845 +v -0.100921 0.4816389 -0.1104681 +v 0.1178833 0.43059 -0.1104079 +v 0.1168789 0.4816278 -0.110407 +v 0.1485467 0.4816262 -0.1103982 +v 0.1485473 0.4305885 -0.1103993 +v -0.1557827 0.4306211 -0.15566 +v -0.1014828 0.4306012 -0.1104693 +v -0.1017039 0.4306183 -0.1556394 +v -0.1558186 0.430604 -0.1104845 +v 0.1185643 0.4306071 -0.1555556 +v 0.1178833 0.43059 -0.1104079 +v 0.1485473 0.4305885 -0.1103993 +v 0.1485934 0.4306055 -0.1555442 +v -0.2155455 0.3187527 0.06745522 +v -0.2192377 0.2661723 -0.1300929 +v -0.2192377 0.3245943 -0.130084 +v -0.2192377 0.2661723 -0.1300929 +v -0.2155455 0.3187527 0.06745522 +v -0.21932 0.265956 0.07485848 +v -0.1885018 0.3187375 0.06176909 +v -0.1885756 0.2661569 -0.1294125 +v -0.188502 0.2659409 0.06917235 +v -0.1885757 0.3245788 -0.1294036 +v -0.1885824 0.324561 0.1497628 +v -0.1885824 0.2661389 0.1497563 +v -0.1885757 0.3245788 -0.1294036 +v -0.2192377 0.2661723 -0.1300929 +v -0.1885756 0.2661569 -0.1294125 +v -0.2192377 0.3245943 -0.130084 +v -0.1885018 0.3187375 0.06176909 +v -0.2192377 0.3245943 -0.130084 +v -0.1885757 0.3245788 -0.1294036 +v -0.2155455 0.3187527 0.06745522 +v -0.1885824 0.2661389 0.1497563 +v -0.219243 0.3245764 0.1492618 +v -0.1885824 0.324561 0.1497628 +v -0.2192429 0.2661543 0.1492554 +v -0.1885824 0.2661389 0.1497563 +v -0.21932 0.265956 0.07485848 +v -0.2192429 0.2661543 0.1492554 +v -0.188502 0.2659409 0.06917235 +v -0.2192377 0.2661723 -0.1300929 +v -0.1885756 0.2661569 -0.1294125 +v -0.219243 0.3245764 0.1492618 +v -0.21932 0.265956 0.07485848 +v -0.2155455 0.3187527 0.06745522 +v -0.21932 0.265956 0.07485848 +v -0.219243 0.3245764 0.1492618 +v -0.2192429 0.2661543 0.1492554 +v -0.1885824 0.324561 0.1497628 +v -0.2155455 0.3187527 0.06745522 +v -0.1885018 0.3187375 0.06176909 +v -0.219243 0.3245764 0.1492618 +vt 0.1047263 0.5619388 +vt 0.07445951 0.271961 +vt 0.07446107 0.5641389 +vt 0.1101265 0.2638639 +vt 0.07445872 0.09695607 +vt 0.1054699 0.09055293 +vt 0.07445835 0.001702759 +vt 0.07310555 0.3580096 +vt 0.10593 0.04015858 +vt 0.07310785 0.03701571 +vt 0.10593 0.04015858 +vt 0.07310555 0.3580096 +vt 0.1116184 0.3648703 +vt 0.07540964 0.3413827 +vt 0.105285 0.2163987 +vt 0.07541119 0.2160675 +vt 0.105285 0.2163987 +vt 0.07540964 0.3413827 +vt 0.1048044 0.3417939 +vt 0.6507517 0.1314481 +vt 0.7293991 0.06024094 +vt 0.6475413 0.06161036 +vt 0.7381324 0.176527 +vt 0.6482359 0.2550138 +vt 0.7439063 0.2558783 +vt 0.776994 0.06162908 +vt 0.7697813 0.1925749 +vt 0.8023322 0.06110217 +vt 0.8009151 0.2082991 +vt 0.7661759 0.2545367 +vt 0.8016742 0.2552852 +vt 0.1090715 0.2867005 +vt 0.08671556 0.5576693 +vt 0.1090836 0.5582221 +vt 0.08671556 0.5576693 +vt 0.1090715 0.2867005 +vt 0.08671433 0.2869209 +vt 0.08671407 0.2011174 +vt 0.1089238 0.2000294 +vt 0.07540964 0.3413827 +vt 0.108849 0.5636582 +vt 0.1048044 0.3417939 +vt 0.07540886 0.5631422 +vt 0.07445835 0.001702759 +vt 0.1054699 0.09055293 +vt 0.1101127 -0.001712658 +vt 0.07310482 0.5609241 +vt 0.1076324 0.440455 +vt 0.07310519 0.4347491 +vt 0.1076324 0.440455 +vt 0.07310482 0.5609241 +vt 0.1074039 0.5609387 +vt 0.07310519 0.4347491 +vt 0.1116184 0.3648703 +vt 0.07310555 0.3580096 +vt 0.1116184 0.3648703 +vt 0.07310519 0.4347491 +vt 0.1076324 0.440455 +vt 0.6495525 0.2069534 +vt 0.6754708 0.05991735 +vt 0.6493121 0.0601755 +vt 0.7235311 0.05853732 +vt 0.7149454 0.1737226 +vt 0.8009984 0.1299928 +vt 0.8037695 0.06019958 +vt 0.8033966 0.2534999 +vt 0.7088217 0.2558783 +vt 0.6862118 0.2535588 +vt 0.6490366 0.253469 +vt 0.07353422 -1.408767 +vt 0.1080226 -1.434989 +vt 0.07374223 -1.434905 +vt 0.1055423 -1.402741 +vt 0.07353464 -1.321151 +vt 0.10823 -1.317841 +vt 0.07353473 -1.306378 +vt 0.1061814 -1.302047 +vt 0.07371838 -1.189768 +vt 0.1077906 -1.190077 +vt 0.1080237 -1.17386 +vt 0.07374354 -1.173778 +vt 0.0732381 -1.387326 +vt 0.110529 -1.355173 +vt 0.1103054 -1.387215 +vt 0.07592073 -1.347167 +vt 0.1105286 -1.236515 +vt 0.07301261 -1.232117 +vt 0.1105285 -1.215871 +vt 0.07339638 -1.210116 +vt 0.1103301 -1.060449 +vt 0.0732564 -1.060862 +vt 0.07323702 -1.040174 +vt 0.1103041 -1.040064 +vt 0.07343683 -1.411088 +vt 0.1091034 -1.435225 +vt 0.07373846 -1.435297 +vt 0.109405 -1.40897 +vt 0.07176383 -1.321432 +vt 0.109405 -1.32096 +vt 0.109405 -1.306121 +vt 0.07343683 -1.305833 +vt 0.1091398 -1.188986 +vt 0.07370356 -1.188399 +vt 0.1091034 -1.172923 +vt 0.07373863 -1.172996 +vt 0.1066909 -1.213523 +vt 0.07210153 -1.072001 +vt 0.1064342 -1.071263 +vt 0.07184632 -1.213883 +vt 0.07184632 -1.233896 +vt 0.1083117 -1.234493 +vt 0.07184632 -1.341476 +vt 0.1066908 -1.344152 +vt 0.07213849 -1.382338 +vt 0.1063986 -1.38243 +vt 0.07213849 -1.051453 +vt 0.1063986 -1.051545 +vt 0.07029732 -1.034824 +vt 0.04126886 -0.9994562 +vt 0.07029265 -0.9993934 +vt 0.04127231 -1.034909 +vt 0.06902247 1.019527 +vt 0.04288809 1.044369 +vt 0.06858426 1.044632 +vt 0.04292386 1.019528 +vt 0.06725686 1.120674 +vt 0.04277377 1.123883 +vt 0.06845396 1.15045 +vt 0.04286854 1.150919 +vt 0.04291599 1.164394 +vt 0.0690146 1.164393 +vt 0.06190494 0.7842556 +vt 0.04264835 0.7590564 +vt 0.04226008 0.7842726 +vt 0.06193212 0.7591507 +vt 0.04377058 0.686184 +vt 0.06201413 0.6831086 +vt 0.03885178 0.8168444 +vt 0.06498758 0.8417976 +vt 0.06453375 0.8165813 +vt 0.03888873 0.8417974 +vt 0.06322197 0.743709 +vt 0.03873865 0.7405006 +vt 0.04095426 0.8045778 +vt 0.06022754 0.779642 +vt 0.04092863 0.7797365 +vt 0.0605996 0.8045949 +vt 0.05908969 0.7032981 +vt 0.04084626 0.7002228 +vt 0.06014875 0.6734765 +vt 0.04095212 0.6731868 +vt 0.04100493 0.659712 +vt 0.06063679 0.6597338 +vt 0.074016 1.034879 +vt 0.03657158 1.059512 +vt 0.07408343 1.059672 +vt 0.03566872 1.034967 +vt 0.03790056 1.095644 +vt 0.07418356 1.096502 +vt 0.07402977 1.289227 +vt 0.0358358 1.28955 +vt 0.07401718 1.305015 +vt 0.03567024 1.305101 +vt 0.04016197 1.228751 +vt 0.07388186 1.279995 +vt 0.07398987 1.227896 +vt 0.03873026 1.280155 +vt 0.07383275 1.303646 +vt 0.03807855 1.303558 +vt 0.03823841 1.048893 +vt 0.07384586 1.049216 +vt 0.0738337 1.034155 +vt 0.03807986 1.034068 +vt 0.06232539 1.087542 +vt 0.03636845 1.050336 +vt 0.03575392 1.101741 +vt 0.06223223 1.051497 +vt 0.06216894 1.027009 +vt 0.03664833 1.026933 +vt 0.06218062 1.280985 +vt 0.03658033 1.281598 +vt 0.062169 1.296499 +vt 0.0366484 1.296423 +vt 0.04179839 0.8258974 +vt 0.06738757 0.8107603 +vt 0.0417865 0.8101467 +vt 0.06731816 0.8258216 +vt 0.06821249 0.63208 +vt 0.04164199 0.6178821 +vt 0.0675974 0.5799811 +vt 0.04173542 0.5811406 +vt 0.04179839 0.5564062 +vt 0.0673181 0.5563303 +vt -0.9266862 -0.08541118 +vt -0.9611869 -0.03519447 +vt -0.9266915 -0.0351049 +vt -0.9611824 -0.08553296 +vt 0.07218196 -0.4056155 +vt 0.03702092 -0.3797375 +vt 0.07218207 -0.3795775 +vt 0.03702081 -0.4055429 +vt 0.07218281 -0.2017005 +vt 0.03702188 -0.2013818 +vt 0.07218281 -0.1901243 +vt 0.03702193 -0.1900528 +vt 0.07207737 -0.4168881 +vt 0.03651039 -0.4447637 +vt 0.03651028 -0.4167098 +vt 0.07207753 -0.4446827 +vt 0.07207645 -0.2163636 +vt 0.03650958 -0.2167187 +vt 0.0720764 -0.2043625 +vt 0.03650953 -0.2044421 +vt 0.07367013 -0.9989532 +vt 0.03797146 -0.9639805 +vt 0.07367013 -0.9626508 +vt 0.03797146 -0.9990414 +vt 0.07367013 -0.7117441 +vt 0.03797146 -0.7110333 +vt 0.07367022 -0.6958067 +vt 0.03797146 -0.695895 +vt -0.9270338 -0.08340237 +vt -0.9595566 -0.03656985 +vt -0.9270285 -0.03666501 +vt -0.9595606 -0.08333246 +vt 0.03698432 -0.6959146 +vt 0.07226589 -0.7115566 +vt 0.03698432 -0.7122707 +vt 0.07226589 -0.6960031 +vt 0.03698432 -0.9635922 +vt 0.07226609 -0.9649278 +vt 0.03698432 -1.000381 +vt 0.07226609 -1.00047 +vt -0.9264807 -0.08596556 +vt -0.96244 -0.03634382 +vt -0.9264864 -0.03626948 +vt -0.9624355 -0.08606677 +vt 0.07467964 1.64429 +vt 0.03910765 1.677342 +vt 0.07467785 1.677706 +vt 0.03910944 1.64429 +vt 0.0746699 1.825195 +vt 0.03909937 1.825847 +vt 0.07466892 1.841731 +vt 0.03909856 1.841731 +vt 0.03860608 1.825021 +vt 0.07027638 1.791465 +vt 0.03859597 1.79131 +vt 0.07029008 1.824997 +vt 0.03855163 1.643941 +vt 0.07021573 1.643463 +vt 0.03854641 1.626901 +vt 0.07020905 1.626871 +vt 0.07082465 1.750193 +vt 0.03525234 1.716963 +vt 0.03525413 1.750192 +vt 0.07082286 1.716598 +vt 0.03524406 1.569088 +vt 0.07081474 1.56974 +vt 0.07081393 1.552758 +vt 0.03524325 1.552758 +vt 0.03626105 1.841262 +vt 0.07173289 1.803969 +vt 0.0362762 1.804143 +vt 0.07172158 1.841288 +vt 0.03634444 1.63736 +vt 0.07178289 1.637895 +vt 0.07178818 1.619555 +vt 0.03635156 1.619521 +vt 0.03705603 -0.6565053 +vt 0.07303336 -0.6935894 +vt 0.03619012 -0.6935068 +vt 0.07318981 -0.652477 +vt 0.03949071 -0.6147282 +vt 0.07318994 -0.6074309 +vt 0.03623747 -0.9998407 +vt 0.07399924 -0.9604997 +vt 0.07490978 -0.9997485 +vt 0.03607241 -0.9559904 +vt 0.0714421 -0.9098135 +vt 0.03607227 -0.9016449 +vt 0.07358796 -0.7362652 +vt 0.03621854 -0.7366039 +vt 0.03623639 -0.7164518 +vt 0.07383417 -0.716361 +vt 0.04094926 -0.9629096 +vt 0.06795049 -1.002079 +vt 0.04111376 -1.002159 +vt 0.06795415 -0.9606329 +vt 0.04094926 -0.9122235 +vt 0.07001826 -0.9138385 +vt 0.0425362 -0.7166176 +vt 0.06938985 -0.7368494 +vt 0.04230517 -0.7374985 +vt 0.06937203 -0.7166974 +vt 0.06953648 -0.9018904 +vt 0.04046834 -0.9035001 +vt 0.04253247 -0.9539564 +vt 0.06953648 -0.9562356 +vt 0.04253626 -1.000006 +vt 0.06937203 -1.000086 +vt -0.9258759 -0.08562746 +vt -0.962254 -0.03472956 +vt -0.9258817 -0.03464123 +vt -0.9622494 -0.08574785 +vt 0.07318994 -0.6074309 +vt 0.03745497 -0.4589257 +vt 0.07305184 -0.4592286 +vt 0.03949071 -0.6147282 +vt 0.07303447 -0.4405864 +vt 0.03721429 -0.4405055 +vt 0.06795055 -0.7186912 +vt 0.04109687 -0.7386752 +vt 0.04111376 -0.7187711 +vt 0.06816915 -0.7393237 +vt 0.04094926 -0.9122235 +vt 0.07001826 -0.9138385 +vt 0.06185439 0.6393898 +vt 0.04269305 0.6536231 +vt 0.06190529 0.6533328 +vt 0.04222277 0.6394116 +vt 0.06201413 0.6831086 +vt 0.04377058 0.686184 +vt 0.03873865 0.7405006 +vt 0.06444565 0.7111481 +vt 0.03883592 0.7106789 +vt 0.06322197 0.743709 +vt 0.03888087 0.6969362 +vt 0.06497971 0.6969364 +vt 0.07364416 -0.3014992 +vt 0.03724166 -0.1578624 +vt 0.07365395 -0.157867 +vt 0.03723174 -0.3014958 +vt 0.1078272 0.7534454 +vt 0.07417326 0.6207349 +vt 0.07416408 0.7534422 +vt 0.1078363 0.6207391 +vt -0.9613475 -0.08747221 +vt -0.9274842 -0.1541001 +vt -0.9613475 -0.1541153 +vt -0.9274842 -0.08745734 +vt 0.1087793 0.6997755 +vt 0.0882382 0.9020697 +vt 0.1087842 0.9015982 +vt 0.08823458 0.7001228 +vt -0.9274256 -0.1541764 +vt -0.9612885 -0.08751836 +vt -0.9274256 -0.08753322 +vt -0.9612882 -0.1541615 +vt 0.09364832 0.6960684 +vt 0.07309898 0.8975466 +vt 0.0936436 0.8978938 +vt 0.07310242 0.6955968 +vt -0.8922291 1.620841 +vt -0.9251164 1.771938 +vt -0.8922178 1.771933 +vt -0.9251277 1.620844 +vt -0.8946364 1.7418 +vt -0.92145 1.593272 +vt -0.9214593 1.741796 +vt -0.8946272 1.593276 +vt -0.9274487 1.652646 +vt -0.9588882 1.606026 +vt -0.9588975 1.652646 +vt -0.9274394 1.606026 +vt -0.8918981 1.63825 +vt -0.9278886 1.773048 +vt -0.8918923 1.772707 +vt -0.9278932 1.6385 +vt -0.9537195 1.555602 +vt -0.927613 1.594289 +vt -0.9276206 1.555602 +vt -0.9537116 1.594289 +vt -0.8891768 1.565273 +vt -0.9278702 1.684833 +vt -0.889183 1.685057 +vt -0.9278654 1.564969 +vt -0.9268561 0.1099022 +vt -0.9620305 0.1454432 +vt -0.9268578 0.1458033 +vt -0.9620287 0.1099025 +vt -0.9268656 0.2826017 +vt -0.9620382 0.283246 +vt -0.9268667 0.3051351 +vt -0.9620394 0.3051354 +vt -0.9581223 0.8415622 +vt -0.9306994 0.8023133 +vt -0.9581333 0.8021792 +vt -0.9306844 0.8415369 +vt -0.9581755 0.6532689 +vt -0.9307564 0.6528552 +vt -0.9581822 0.6282688 +vt -0.9307659 0.6282365 +vt -0.928167 0.3026806 +vt -0.9633417 0.2669936 +vt -0.9633396 0.3026802 +vt -0.928169 0.2666333 +vt -0.9633491 0.1296921 +vt -0.9281765 0.1303363 +vt -0.9281778 0.1074541 +vt -0.9633504 0.1074537 +vt -0.9638941 0.8396245 +vt -0.9364454 0.8006605 +vt -0.9638797 0.8007948 +vt -0.9364562 0.8396497 +vt -0.9638221 0.6502392 +vt -0.9364034 0.6506528 +vt -0.9363966 0.6263562 +vt -0.9638132 0.6263241 +vt -0.9266675 0.3409541 +vt -0.965097 0.3788518 +vt -0.9266694 0.3792455 +vt -0.9650948 0.3409544 +vt -0.9266777 0.5325076 +vt -0.9651055 0.5332114 +vt -0.9266789 0.5542548 +vt -0.9651065 0.5542551 +vt -0.9655966 0.8331729 +vt -0.9339534 0.7948564 +vt -0.9656075 0.7947015 +vt -0.933939 0.8331479 +vt -0.96565 0.6420716 +vt -0.9340118 0.6415943 +vt -0.9656563 0.6198796 +vt -0.9340199 0.6198473 +vt -0.9258831 0.5558691 +vt -0.9643128 0.5177912 +vt -0.9643111 0.5558686 +vt -0.9258852 0.5173975 +vt -0.9643214 0.3640638 +vt -0.9258935 0.3647677 +vt -0.925895 0.3425754 +vt -0.9643228 0.3425751 +vt -0.9612597 0.8407305 +vt -0.929591 0.8026782 +vt -0.9612454 0.8028331 +vt -0.9296015 0.8407555 +vt -0.9611862 0.6484736 +vt -0.9295478 0.648951 +vt -0.9295419 0.6274623 +vt -0.9611786 0.6274298 +vt -0.9302188 -0.2697633 +vt -0.9612144 -0.1613768 +vt -0.9267755 -0.1613817 +vt -0.9612144 -0.1613768 +vt -0.9302188 -0.2697633 +vt -0.961342 -0.273825 +vt -0.9305366 -0.2090986 +vt -0.9615322 -0.3139919 +vt -0.9616597 -0.2050367 +vt -0.9270931 -0.313987 +vt -0.9271038 -0.16082 +vt -0.961543 -0.1608236 +vt -0.9617806 -0.1632785 +vt -0.9282315 -0.2258629 +vt -0.9617806 -0.2258794 +vt -0.9282315 -0.163262 +vt -0.926842 -0.3495179 +vt -0.9604719 -0.1581804 +vt -0.9269223 -0.1588589 +vt -0.9564319 -0.3551885 +vt -0.9297775 -0.2196832 +vt -0.9633251 -0.1570656 +vt -0.9297775 -0.1570823 +vt -0.9633251 -0.2196664 +vt -0.9275921 -0.1630015 +vt -0.9612237 -0.2376977 +vt -0.9611398 -0.1635011 +vt -0.9275038 -0.2433686 +vt -0.9611339 -0.4420985 +vt -0.9275843 -0.44142 +vt -0.9267859 -0.3146471 +vt -0.961342 -0.273825 +vt -0.9302188 -0.2697633 +vt -0.961342 -0.273825 +vt -0.9267859 -0.3146471 +vt -0.9612252 -0.3146437 +vt -0.9269298 -0.4372749 +vt -0.9564319 -0.3551885 +vt -0.926842 -0.3495179 +vt -0.960478 -0.4367753 +vn -0.9996172 0.02055689 -0.01851603 +vn -0.9996172 0.02055689 -0.01851603 +vn -0.9996172 0.02055689 -0.01851603 +vn -0.9988301 0.04570382 -0.01579458 +vn -0.998827 0.04761196 0.00881155 +vn -0.998827 0.04761197 0.00881155 +vn -0.998827 0.04761197 0.00881155 +vn 0.9994444 -0.02461245 -0.02247281 +vn 0.9994444 -0.02461245 -0.02247282 +vn 0.9994444 -0.02461245 -0.02247282 +vn 0.9950663 0.09873106 -0.009755834 +vn 0.9950663 0.09873105 -0.009755834 +vn 0.9950663 0.09873105 -0.009755834 +vn 0.0442555 0.06945079 -0.9966033 +vn 0.04425551 0.0694508 -0.9966033 +vn 0.04425551 0.06945081 -0.9966033 +vn 0.05123346 0.1214977 -0.9912685 +vn 0.05123347 0.1214977 -0.9912685 +vn 0.05123346 0.1214977 -0.9912685 +vn -0.003423666 0.999804 -0.01950209 +vn -0.00224075 0.9999952 0.002153804 +vn 0.003164316 0.9998216 -0.0186203 +vn -0.009726711 0.9999403 -0.004982502 +vn -0.01067823 0.9997898 -0.01750749 +vn -0.003742737 0.9999298 0.01124924 +vn -0.01226407 0.9998026 -0.01563032 +vn -0.004424906 0.9999564 0.008234622 +vn -0.01424201 0.9990329 -0.04159898 +vn 0.003011302 0.9999688 0.007317456 +vn 0.006576024 0.9995365 0.02972498 +vn 0.001550101 0.9999971 0.001852282 +vn 0.01071694 -0.09225623 0.9956776 +vn 0.01071694 -0.09225623 0.9956776 +vn 0.01071694 -0.09225623 0.9956776 +vn 0.001830523 0.02366016 0.9997184 +vn 0.001830523 0.02366016 0.9997184 +vn 0.001830523 0.02366016 0.9997184 +vn -0.01239992 0.02380895 0.9996396 +vn -0.01806745 0.0005141795 0.9998367 +vn -0.02388684 0.1234206 -0.9920669 +vn -0.02388684 0.1234206 -0.9920669 +vn -0.02388684 0.1234206 -0.9920669 +vn -0.02160995 0.0966735 -0.9950815 +vn -0.9995397 -0.0249279 -0.01728861 +vn -0.9995397 -0.0249279 -0.01728861 +vn -0.9995397 -0.0249279 -0.01728861 +vn 0.999763 0.02166336 0.002159178 +vn 0.999763 0.02166336 0.002159178 +vn 0.999763 0.02166335 0.002159178 +vn 0.9984395 -0.05254019 -0.01892272 +vn 0.9984395 -0.05254019 -0.01892272 +vn 0.9984395 -0.05254019 -0.01892272 +vn 0.9925975 0.08038017 0.09104578 +vn 0.9925975 0.08038018 0.09104579 +vn 0.9925975 0.08038018 0.09104578 +vn 0.9984326 0.01291757 0.05445695 +vn 0.9984326 0.01291757 0.05445696 +vn 0.9984326 0.01291757 0.05445695 +vn -4.139798E-06 -1 -5.613743E-06 +vn -4.139798E-06 -1 -5.613744E-06 +vn -4.139798E-06 -1 -5.613744E-06 +vn -4.189872E-06 -1 -5.359749E-06 +vn -3.61283E-06 -1 -6.394836E-06 +vn -6.836332E-06 -1 -6.062123E-06 +vn -6.836332E-06 -1 -6.062123E-06 +vn -3.300168E-06 -1 -6.003404E-06 +vn -3.300169E-06 -1 -6.003404E-06 +vn -3.411249E-06 -1 -4.670954E-06 +vn -2.799499E-06 -1 -6.190722E-06 +vn -0.9999636 -0.008528741 -0.0001084998 +vn -0.9999636 -0.008528741 -0.0001084998 +vn -0.9999636 -0.008528739 -0.0001084997 +vn -0.9999762 -0.006822344 0.001099084 +vn -1 -1.163931E-07 -9.637305E-05 +vn -1 2.857002E-06 -8.931864E-05 +vn -1 -3.463834E-07 -8.903412E-05 +vn -1 -1.294813E-05 -9.290902E-05 +vn -0.9999985 0.001740672 -0.000110717 +vn -0.9999985 0.001740672 -0.000110717 +vn -0.9999986 0.001680762 -8.497245E-05 +vn -0.9999986 0.001680762 -8.497245E-05 +vn 0.9999673 -0.008030967 0.0008884315 +vn 0.9999403 -0.01082312 0.001502331 +vn 0.9999572 -0.009248735 9.300368E-05 +vn 0.9999387 -0.01091109 0.001873536 +vn 0.9995478 0.0299718 -0.002397415 +vn 0.9994358 0.03337935 -0.003696895 +vn 0.9990772 0.04276396 -0.003999916 +vn 0.999358 0.03559826 -0.004044931 +vn 0.9999986 0.001716422 8.511235E-05 +vn 0.9999985 0.001743576 9.404048E-05 +vn 0.9999986 0.001729246 9.997322E-05 +vn 0.9999986 0.00168653 0.0001176597 +vn 0.003367475 -0.009242002 -0.9999516 +vn 0.003367475 -0.009242001 -0.9999516 +vn 0.003367475 -0.009242001 -0.9999516 +vn 0.002716479 -0.008527939 -0.9999599 +vn 0.003389705 -4.115781E-05 -0.9999943 +vn 0.003242451 5.848183E-06 -0.9999948 +vn 0.003242434 4.856518E-06 -0.9999948 +vn 0.003390583 0.0002752307 -0.9999943 +vn 0.003395512 0.001687077 -0.9999928 +vn 0.003397692 0.001690779 -0.9999928 +vn 0.003397692 0.001690779 -0.9999928 +vn 0.003397692 0.001690779 -0.9999928 +vn -0.04315697 0.02441951 0.9987698 +vn -0.02000814 -0.003318013 0.9997943 +vn -0.01128917 -0.001257964 0.9999355 +vn -0.07130878 0.06172856 0.9955425 +vn -0.02536418 0.03251975 0.9991492 +vn -0.002713285 -0.006367901 0.999976 +vn -0.0005643461 0.02146819 0.9997694 +vn -0.001765309 0.02834842 0.9995965 +vn 0.0006399077 0.0853521 0.9963506 +vn -0.002245364 0.08785668 0.9961306 +vn -0.002501635 -0.001241668 0.9999962 +vn -0.002501634 -0.001241668 0.9999962 +vn -0.002764398 -0.9999936 -0.00228536 +vn -0.002764398 -0.9999936 -0.00228536 +vn -0.002764397 -0.9999936 -0.00228536 +vn -0.002761674 -0.9999936 -0.002283422 +vn -0.001079488 -1.848304E-05 -0.9999994 +vn -0.001079488 -1.848304E-05 -0.9999994 +vn -0.001079488 -1.848304E-05 -0.9999994 +vn -0.001035421 2.652178E-05 -0.9999995 +vn 0.003636125 0.0004914171 -0.9999933 +vn 0.003636125 0.0004914172 -0.9999933 +vn 0.003915571 0.0001805541 -0.9999924 +vn 0.003915572 0.0001805542 -0.9999924 +vn 0.003915572 0.0001805542 -0.9999924 +vn 0.003653405 2.676073E-05 -0.9999933 +vn 0.0167568 0.9998595 0.0004173921 +vn 0.0167568 0.9998595 0.000417392 +vn 0.0167568 0.9998595 0.0004173921 +vn 0.01624597 0.9998674 0.001086044 +vn 0.01624825 0.9998629 0.00316883 +vn 0.01624825 0.9998629 0.00316883 +vn 0.01540617 0.000497859 0.9998811 +vn 0.01540617 0.0004978589 0.9998811 +vn 0.01540617 0.000497859 0.9998811 +vn 0.01490235 -1.907983E-05 0.999889 +vn 0.01490514 0.002114054 0.9998866 +vn 0.01490514 0.002114054 0.9998866 +vn -0.001339799 -0.999999 -0.0004682924 +vn -0.001339799 -0.999999 -0.0004682923 +vn -0.001339799 -0.999999 -0.0004682924 +vn -0.001384915 -0.999999 -0.0004099209 +vn 0.003034406 -0.9999955 7.387242E-05 +vn 0.003267991 -0.9999946 -0.0002497993 +vn 0.003267991 -0.9999946 -0.0002497993 +vn 0.003267991 -0.9999946 -0.0002497993 +vn 0.003050386 -0.9999954 -0.0004065347 +vn 0.003050386 -0.9999954 -0.0004065347 +vn -0.9999963 -0.002734297 -6.984235E-05 +vn -0.9999963 -0.002734297 -6.984235E-05 +vn -0.9999963 -0.002734297 -6.984235E-05 +vn -0.9999962 -0.002772577 -9.490552E-05 +vn -0.9999963 -0.00273383 -3.048055E-05 +vn -0.9999963 -0.00273383 -3.048055E-05 +vn -0.9999996 0.0008079561 -8.928273E-05 +vn -0.9999998 0.000802745 -8.718215E-05 +vn -0.9999998 0.000802745 -8.718215E-05 +vn -0.9999998 0.0008027451 -8.718214E-05 +vn 0.9999194 -0.01268591 0.0004193316 +vn 0.9999194 -0.01268591 0.0004193316 +vn 0.9999194 -0.01268591 0.0004193316 +vn 0.9999174 -0.01285038 0.0001866579 +vn 0.9999175 -0.01284782 8.468107E-05 +vn 0.9999175 -0.01284782 8.468107E-05 +vn 0.9999877 0.004959391 0.0001166241 +vn 0.9999877 0.004959391 0.0001166241 +vn 0.9999877 0.004959391 0.0001166241 +vn 0.9999878 0.004937236 0.0001251624 +vn -0.01164758 0.03005701 -0.9994803 +vn -0.01164758 0.03005701 -0.9994803 +vn -0.01164758 0.03005701 -0.9994803 +vn -0.002474661 0.03692639 -0.9993149 +vn 0.003474436 0.0298646 -0.9995479 +vn 0.003474436 0.02986461 -0.9995479 +vn 0.003779254 -0.01070263 -0.9999356 +vn 0.003361271 -0.01147371 -0.9999286 +vn 0.003361271 -0.01147371 -0.9999286 +vn 0.003361271 -0.01147371 -0.9999286 +vn -0.002523473 0.0008030261 0.9999965 +vn -0.002523473 0.0008030261 0.9999965 +vn -0.002523473 0.0008030261 0.9999965 +vn -0.002496172 0.0008526126 0.9999965 +vn -0.001331723 -0.002211755 0.9999967 +vn -0.002045272 -0.00273677 0.9999942 +vn -0.002045272 -0.00273677 0.9999942 +vn -0.002045272 -0.00273677 0.9999942 +vn -0.002504613 -0.002196797 0.9999945 +vn -0.002504612 -0.002196797 0.9999945 +vn -0.002764507 -0.9999936 -0.002285681 +vn -0.002764508 -0.9999936 -0.002285681 +vn -0.002764508 -0.9999936 -0.002285681 +vn -0.002761769 -0.9999936 -0.002283723 +vn -1 -3.34643E-07 -7.48129E-05 +vn -1 -3.34643E-07 -7.48129E-05 +vn -1 -3.34643E-07 -7.48129E-05 +vn -1 -3.375711E-07 -7.481492E-05 +vn -1 -1.462805E-07 -7.481605E-05 +vn -1 -1.462805E-07 -7.481604E-05 +vn -1 -7.695557E-07 -7.481631E-05 +vn -1 -7.695556E-07 -7.481631E-05 +vn 1 3.463067E-07 9.5877E-05 +vn 1 3.463068E-07 9.5877E-05 +vn 1 3.463068E-07 9.587701E-05 +vn 1 0 9.564737E-05 +vn 1 2.184591E-07 9.588097E-05 +vn 1 2.184591E-07 9.588097E-05 +vn 1 3.958306E-07 9.599545E-05 +vn 1 3.958306E-07 9.599545E-05 +vn 0.003393115 6.254832E-06 -0.9999943 +vn 0.003393115 6.254832E-06 -0.9999943 +vn 0.003393115 6.254832E-06 -0.9999943 +vn 0.00339345 5.950111E-06 -0.9999943 +vn 0.003393492 6.016498E-06 -0.9999943 +vn 0.003393492 6.016497E-06 -0.9999943 +vn 0.003393642 6.079624E-06 -0.9999943 +vn 0.003393642 6.079623E-06 -0.9999943 +vn 0.002759614 0.9999944 0.001891038 +vn 0.002759614 0.9999944 0.001891038 +vn 0.002759614 0.9999944 0.001891038 +vn 0.00276218 0.9999944 0.001889502 +vn -0.002497679 -3.769552E-06 0.9999969 +vn -0.002497679 -3.769552E-06 0.9999969 +vn -0.002497679 -3.769552E-06 0.9999969 +vn -0.002497774 -3.963087E-06 0.9999969 +vn -0.002497971 -5.026106E-06 0.9999969 +vn -0.00249816 -4.855662E-06 0.9999969 +vn -0.00249816 -4.855662E-06 0.9999969 +vn -0.00249816 -4.855662E-06 0.9999969 +vn -0.002765988 -0.9999944 -0.001924753 +vn -0.002765989 -0.9999944 -0.001924753 +vn -0.002765988 -0.9999944 -0.001924753 +vn -0.002762948 -0.9999944 -0.001922925 +vn 0.0004085779 3.081861E-05 -1 +vn 0.000408578 3.081861E-05 -1 +vn 0.000408578 3.081861E-05 -1 +vn 0.0004085953 3.083583E-05 -1 +vn 0.0004081689 3.082885E-05 -1 +vn 0.0004085433 3.064915E-05 -1 +vn 0.0004085434 3.064915E-05 -1 +vn 0.0004085433 3.064915E-05 -1 +vn 5.108955E-05 1 0.0003434441 +vn 5.108955E-05 1 0.0003434441 +vn 5.108955E-05 1 0.0003434442 +vn 5.095494E-05 1 0.0003433015 +vn 5.08984E-05 1 0.0003426766 +vn 5.074071E-05 1 0.0003427591 +vn 5.074071E-05 1 0.0003427592 +vn 5.074072E-05 1 0.0003427592 +vn -0.0003006632 -2.242616E-05 1 +vn -0.0003006632 -2.242616E-05 1 +vn -0.0003006632 -2.242616E-05 1 +vn -0.000300713 -2.247618E-05 1 +vn -0.0003007844 -2.205247E-05 1 +vn -0.0003005451 -2.217055E-05 1 +vn -0.0003007844 -2.205247E-05 1 +vn -0.0003007845 -2.205247E-05 1 +vn -5.114165E-05 -1 -0.0003502986 +vn -5.114165E-05 -1 -0.0003502986 +vn -5.114165E-05 -1 -0.0003502985 +vn -5.090476E-05 -1 -0.0003505476 +vn -5.126542E-05 -1 -0.0003502067 +vn -5.06565E-05 -1 -0.0003505127 +vn -5.126542E-05 -1 -0.0003502067 +vn -5.126542E-05 -1 -0.0003502067 +vn -1 -9.465492E-05 -8.672647E-05 +vn -1 -9.465491E-05 -8.672645E-05 +vn -1 -9.465493E-05 -8.672646E-05 +vn -1 -8.74499E-05 -7.935481E-05 +vn -0.9988511 -0.0476423 0.005183108 +vn -0.9989918 -0.04390897 0.009342309 +vn 0.9999899 -0.004505282 0.000100603 +vn 0.9999899 -0.004505282 0.000100603 +vn 0.9999899 -0.004505282 0.000100603 +vn 0.9999918 -0.004031258 0.0005602566 +vn 1 -6.115015E-06 0.0001148305 +vn 1 2.037577E-07 0.0001225086 +vn 0.9999995 0.0009545319 9.681178E-05 +vn 0.9999995 0.0009545319 9.681178E-05 +vn 0.9999995 0.0009545318 9.681177E-05 +vn 0.9999996 0.0009151601 0.0001162503 +vn 0.003461157 0.02490313 -0.9996839 +vn 0.003461157 0.02490313 -0.9996839 +vn 0.003461157 0.02490313 -0.9996839 +vn 0.005260732 0.02357094 -0.9997082 +vn 0.007653981 0.05412522 -0.9985049 +vn 0.0001346052 0.0586188 -0.9982804 +vn -0.002483042 0.0009679171 0.9999964 +vn -0.002483042 0.0009679171 0.9999964 +vn -0.002483042 0.0009679172 0.9999964 +vn -0.002495904 0.0009495757 0.9999964 +vn -0.002329257 -0.0001063389 0.9999973 +vn -0.002329257 -0.0001063389 0.9999973 +vn -0.002813168 -0.003833176 0.9999887 +vn -0.002813168 -0.003833176 0.9999887 +vn -0.002813168 -0.003833176 0.9999887 +vn -0.002509687 -0.004034312 0.9999888 +vn -0.002764664 -0.9999937 -0.002222806 +vn -0.002764664 -0.9999937 -0.002222806 +vn -0.002764664 -0.9999937 -0.002222806 +vn -0.002761983 -0.9999938 -0.002220942 +vn -0.9999293 0.0118871 -0.0003213401 +vn -0.9999293 0.0118871 -0.0003213401 +vn -0.9999293 0.0118871 -0.0003213401 +vn -0.9999324 0.01135038 -0.002535445 +vn -0.9999353 0.01138293 -6.338311E-05 +vn -0.9999353 0.01138293 -6.338311E-05 +vn 0.003356193 -0.0132816 -0.9999062 +vn 0.003356192 -0.0132816 -0.9999062 +vn 0.003356193 -0.0132816 -0.9999062 +vn 0.003411676 -0.01320152 -0.999907 +vn 0.003854048 -0.01320597 -0.9999053 +vn 0.003854048 -0.01320597 -0.9999053 +vn -0.03738853 0.9992998 -0.001437519 +vn -0.03738852 0.9992998 -0.001437519 +vn -0.03738852 0.9992998 -0.001437519 +vn -0.0349669 0.9993885 0.0003636523 +vn -0.03477381 0.9993805 -0.00543217 +vn -0.03477381 0.9993805 -0.005432169 +vn -0.03548346 -0.001460636 0.9993692 +vn -0.03548346 -0.001460636 0.9993692 +vn -0.03548346 -0.001460636 0.9993692 +vn -0.03291243 -0.004618266 0.9994475 +vn -0.03307311 -1.961884E-05 0.9994529 +vn -0.03307311 -1.961884E-05 0.9994529 +vn -1 -8.667056E-07 -1.880014E-05 +vn -1 -8.667056E-07 -1.880014E-05 +vn -1 -8.667056E-07 -1.880014E-05 +vn -1 -1.446846E-06 -1.86633E-05 +vn 1 1.446283E-06 2.428406E-05 +vn 1 1.446283E-06 2.428405E-05 +vn 1 1.446283E-06 2.428405E-05 +vn 1 1.155695E-06 2.435264E-05 +vn 0.02294642 0.0001334149 -0.9997367 +vn 0.02294642 0.0001334149 -0.9997367 +vn 0.02294642 0.0001334149 -0.9997367 +vn 0.0229471 0.0001331187 -0.9997366 +vn 0.0005186224 0.9999999 6.417753E-05 +vn 0.0005186225 0.9999999 6.417753E-05 +vn 0.0005186225 0.9999999 6.417753E-05 +vn 0.00051904 0.9999999 6.413512E-05 +vn -0.01689662 -9.866544E-05 0.9998572 +vn -0.01689662 -9.866543E-05 0.9998572 +vn -0.01689663 -9.866544E-05 0.9998572 +vn -0.01689562 -9.823091E-05 0.9998573 +vn -0.0005190358 -0.9999999 -6.438219E-05 +vn -0.0005190359 -0.9999999 -6.438219E-05 +vn -0.0005190359 -0.9999999 -6.438219E-05 +vn -0.0005192888 -0.9999999 -6.440798E-05 +vn -1 -3.543654E-06 -4.044328E-05 +vn -1 -3.543654E-06 -4.044328E-05 +vn -1 -3.543654E-06 -4.044328E-05 +vn -1 -2.704561E-06 -4.061326E-05 +vn 1 2.516305E-06 5.220723E-05 +vn 1 2.516304E-06 5.220723E-05 +vn 1 2.516305E-06 5.220724E-05 +vn 1 2.514013E-06 5.22077E-05 +vn 0.007847817 0.0001640758 -0.9999692 +vn 0.007847817 0.0001640758 -0.9999692 +vn 0.007847816 0.0001640758 -0.9999692 +vn 0.007847695 0.0001642708 -0.9999692 +vn 0.0001866921 1 7.022608E-05 +vn 0.0001866921 1 7.022608E-05 +vn 0.000186692 1 7.022607E-05 +vn 0.000186962 1 7.01391E-05 +vn -0.005777808 -0.0001199747 0.9999833 +vn -0.005777808 -0.0001199747 0.9999833 +vn -0.005777808 -0.0001199747 0.9999833 +vn -0.005777691 -0.000119789 0.9999833 +vn -0.0001871912 -1 -7.109702E-05 +vn -0.0001871912 -1 -7.109701E-05 +vn -0.0001871912 -1 -7.109701E-05 +vn -0.0001869206 -1 -7.100945E-05 +vn 0.000380643 3.000508E-05 -1 +vn 0.000380643 3.000508E-05 -1 +vn 0.000380643 3.000508E-05 -1 +vn 0.0003803754 2.971451E-05 -1 +vn 0.0003803265 2.953314E-05 -1 +vn 0.0003803349 2.952753E-05 -1 +vn 0.000380335 2.952753E-05 -1 +vn 0.000380335 2.952753E-05 -1 +vn 5.146663E-05 0.9999999 0.0004314246 +vn 5.146663E-05 0.9999999 0.0004314246 +vn 5.146663E-05 0.9999999 0.0004314246 +vn 5.027057E-05 0.9999999 0.0004297127 +vn 5.120603E-05 0.9999999 0.0004307373 +vn 5.087183E-05 0.9999999 0.0004310369 +vn 5.087183E-05 0.9999999 0.0004310369 +vn 5.087183E-05 0.9999999 0.0004310368 +vn -0.0002802582 -2.149167E-05 1 +vn -0.0002802582 -2.149167E-05 1 +vn -0.0002802582 -2.149168E-05 1 +vn -0.0002801688 -2.13942E-05 1 +vn -0.0002800183 -2.186537E-05 1 +vn -0.0002801595 -2.176944E-05 1 +vn -0.0002800182 -2.186537E-05 1 +vn -0.0002800183 -2.186537E-05 1 +vn -5.078003E-05 -0.9999999 -0.0004362947 +vn -5.078003E-05 -0.9999999 -0.0004362947 +vn -5.078003E-05 -0.9999999 -0.0004362946 +vn -5.061533E-05 -0.9999999 -0.0004365284 +vn -5.12529E-05 -0.9999999 -0.0004368833 +vn -5.048961E-05 -0.9999999 -0.000437548 +vn -5.12529E-05 -0.9999999 -0.0004368833 +vn -5.12529E-05 -0.9999999 -0.0004368833 +vn 0.0003806603 2.907058E-05 -1 +vn 0.0003806603 2.907058E-05 -1 +vn 0.0003806603 2.907058E-05 -1 +vn 0.0003805627 2.896718E-05 -1 +vn 0.0003807606 2.879451E-05 -1 +vn 0.0003804674 2.896698E-05 -1 +vn 0.0003804674 2.896699E-05 -1 +vn 0.0003804674 2.896699E-05 -1 +vn 5.062086E-05 1 0.0003730327 +vn 5.062085E-05 1 0.0003730327 +vn 5.062086E-05 1 0.0003730327 +vn 5.151966E-05 1 0.000374121 +vn 5.048844E-05 1 0.0003733808 +vn 5.025688E-05 1 0.0003735397 +vn 5.025688E-05 1 0.0003735397 +vn 5.025688E-05 1 0.0003735397 +vn -0.0002801227 -2.167851E-05 1 +vn -0.0002801227 -2.167851E-05 1 +vn -0.0002801228 -2.167852E-05 1 +vn -0.0002800326 -2.158256E-05 1 +vn -0.0002802189 -2.149167E-05 1 +vn -0.0002803713 -2.140003E-05 1 +vn -0.0002802188 -2.149167E-05 1 +vn -0.0002802189 -2.149167E-05 1 +vn -5.134971E-05 -1 -0.0003789371 +vn -5.13497E-05 -1 -0.0003789371 +vn -5.134971E-05 -1 -0.0003789372 +vn -5.114411E-05 -1 -0.0003791842 +vn -5.193977E-05 -1 -0.0003786081 +vn -5.089894E-05 -1 -0.0003792993 +vn -5.193977E-05 -1 -0.0003786081 +vn -5.193977E-05 -1 -0.0003786082 +vn -0.9998254 -3.489886E-06 0.01868783 +vn -0.9998254 -3.489885E-06 0.01868783 +vn -0.9998254 -3.489885E-06 0.01868783 +vn -0.9974574 0.07126335 -0.0003251419 +vn -0.9974574 0.07126335 -0.0003251419 +vn -0.9974574 0.07126335 -0.0003251419 +vn 1 -5.417556E-05 -0.0003708965 +vn 1 -5.417556E-05 -0.0003708965 +vn 1 -5.417555E-05 -0.0003708965 +vn 1 1.364601E-06 -0.0003861717 +vn 0.9999996 0.0001250885 0.0009075309 +vn 0.9999995 8.686641E-07 0.0009978859 +vn 0.02218485 0.0001519672 -0.9997539 +vn 0.02218485 0.0001519672 -0.9997539 +vn 0.02218485 0.0001519672 -0.9997539 +vn 0.02218519 0.0001517895 -0.9997539 +vn -0.0001740919 0.9995335 0.03054097 +vn -0.0001740919 0.9995335 0.03054097 +vn -0.0001740919 0.9995335 0.03054097 +vn 0.006748783 0.999544 0.02943221 +vn -0.01633662 -0.0001110035 0.9998666 +vn -0.01633662 -0.0001110035 0.9998666 +vn -0.01633662 -0.0001110035 0.9998666 +vn -0.01633632 -0.0001108457 0.9998666 +vn -0.0005468289 -0.9999963 0.002666342 +vn -0.0005468289 -0.9999963 0.002666342 +vn -0.0005468289 -0.9999963 0.002666341 +vn -3.56808E-05 -0.999997 0.002456572 +vn -0.0006837386 -0.9999993 -0.0010558 +vn -0.0004797369 -0.9999993 -0.001087266 +vn -0.9966962 0.06429581 -0.04962621 +vn -0.9966962 0.06429582 -0.04962622 +vn -0.9966962 0.06429582 -0.04962622 +vn -0.9999995 -1.420655E-06 0.001035245 +vn -0.9999995 -1.420655E-06 0.001035245 +vn -0.9999995 -1.420655E-06 0.001035245 +vn -0.01332644 0.9977278 -0.06604224 +vn -0.01332644 0.9977278 -0.06604224 +vn -0.01332644 0.9977278 -0.06604224 +vn 0.001660354 0.9974796 -0.07093425 +g Obj_BenchD_0 +f 3/3/3 2/2/2 1/1/1 +f 4/4/4 1/1/1 2/2/2 +f 2/2/2 5/5/5 4/4/4 +f 6/6/6 4/4/4 5/5/5 +f 5/5/5 7/7/7 6/6/6 +f 10/10/10 9/9/9 8/8/8 +f 13/13/13 12/12/12 11/11/11 +f 16/16/16 15/15/15 14/14/14 +f 19/19/19 18/18/18 17/17/17 +f 22/22/22 21/21/21 20/20/20 +f 23/23/23 20/20/20 21/21/21 +f 20/20/20 23/23/23 24/24/24 +f 25/25/25 24/24/24 23/23/23 +f 21/21/21 26/26/26 23/23/23 +f 27/27/27 23/23/23 26/26/26 +f 23/23/23 27/27/27 25/25/25 +f 26/26/26 28/28/28 27/27/27 +f 29/29/29 27/27/27 28/28/28 +f 27/27/27 29/29/29 30/30/30 +f 30/30/30 25/25/25 27/27/27 +f 31/31/31 30/30/30 29/29/29 +f 34/34/34 33/33/33 32/32/32 +f 37/37/37 36/36/36 35/35/35 +f 37/37/37 38/38/38 36/36/36 +f 39/39/39 36/36/36 38/38/38 +f 42/42/42 41/41/41 40/40/40 +f 43/43/43 40/40/40 41/41/41 +f 46/46/46 45/45/45 44/44/44 +f 49/49/49 48/48/48 47/47/47 +f 52/52/52 51/51/51 50/50/50 +f 55/55/55 54/54/54 53/53/53 +f 58/58/58 57/57/57 56/56/56 +f 61/61/61 60/60/60 59/59/59 +f 60/60/60 62/62/62 59/59/59 +f 62/62/62 63/63/63 59/59/59 +f 63/63/63 62/62/62 64/64/64 +f 65/65/65 64/64/64 62/62/62 +f 64/64/64 66/66/66 63/63/63 +f 67/67/67 63/63/63 66/66/66 +f 67/67/67 68/68/68 63/63/63 +f 68/68/68 69/69/69 63/63/63 +f 69/69/69 59/59/59 63/63/63 +f 72/72/72 71/71/71 70/70/70 +f 73/73/73 70/70/70 71/71/71 +f 70/70/70 73/73/73 74/74/74 +f 75/75/75 74/74/74 73/73/73 +f 74/74/74 75/75/75 76/76/76 +f 77/77/77 76/76/76 75/75/75 +f 76/76/76 77/77/77 78/78/78 +f 79/79/79 78/78/78 77/77/77 +f 79/79/79 80/80/80 78/78/78 +f 81/81/81 78/78/78 80/80/80 +f 84/84/84 83/83/83 82/82/82 +f 85/85/85 82/82/82 83/83/83 +f 83/83/83 86/86/86 85/85/85 +f 87/87/87 85/85/85 86/86/86 +f 86/86/86 88/88/88 87/87/87 +f 89/89/89 87/87/87 88/88/88 +f 88/88/88 90/90/90 89/89/89 +f 91/91/91 89/89/89 90/90/90 +f 91/91/91 90/90/90 92/92/92 +f 93/93/93 92/92/92 90/90/90 +f 96/96/96 95/95/95 94/94/94 +f 97/97/97 94/94/94 95/95/95 +f 94/94/94 97/97/97 98/98/98 +f 99/99/99 98/98/98 97/97/97 +f 99/99/99 100/100/100 98/98/98 +f 101/101/101 98/98/98 100/100/100 +f 100/100/100 102/102/102 101/101/101 +f 103/103/103 101/101/101 102/102/102 +f 102/102/102 104/104/104 103/103/103 +f 105/105/105 103/103/103 104/104/104 +f 108/108/108 107/107/107 106/106/106 +f 109/109/109 106/106/106 107/107/107 +f 109/109/109 110/110/110 106/106/106 +f 111/111/111 106/106/106 110/110/110 +f 110/110/110 112/112/112 111/111/111 +f 113/113/113 111/111/111 112/112/112 +f 112/112/112 114/114/114 113/113/113 +f 115/115/115 113/113/113 114/114/114 +f 107/107/107 108/108/108 116/116/116 +f 117/117/117 116/116/116 108/108/108 +f 120/120/120 119/119/119 118/118/118 +f 121/121/121 118/118/118 119/119/119 +f 124/124/124 123/123/123 122/122/122 +f 125/125/125 122/122/122 123/123/123 +f 124/124/124 126/126/126 123/123/123 +f 127/127/127 123/123/123 126/126/126 +f 126/126/126 128/128/128 127/127/127 +f 129/129/129 127/127/127 128/128/128 +f 129/129/129 128/128/128 130/130/130 +f 131/131/131 130/130/130 128/128/128 +f 134/134/134 133/133/133 132/132/132 +f 135/135/135 132/132/132 133/133/133 +f 133/133/133 136/136/136 135/135/135 +f 137/137/137 135/135/135 136/136/136 +f 140/140/140 139/139/139 138/138/138 +f 141/141/141 138/138/138 139/139/139 +f 140/140/140 138/138/138 142/142/142 +f 143/143/143 142/142/142 138/138/138 +f 146/146/146 145/145/145 144/144/144 +f 147/147/147 144/144/144 145/145/145 +f 145/145/145 146/146/146 148/148/148 +f 149/149/149 148/148/148 146/146/146 +f 148/148/148 149/149/149 150/150/150 +f 151/151/151 150/150/150 149/149/149 +f 151/151/151 152/152/152 150/150/150 +f 153/153/153 150/150/150 152/152/152 +f 156/156/156 155/155/155 154/154/154 +f 157/157/157 154/154/154 155/155/155 +f 155/155/155 156/156/156 158/158/158 +f 159/159/159 158/158/158 156/156/156 +f 159/159/159 160/160/160 158/158/158 +f 161/161/161 158/158/158 160/160/160 +f 160/160/160 162/162/162 161/161/161 +f 163/163/163 161/161/161 162/162/162 +f 166/166/166 165/165/165 164/164/164 +f 167/167/167 164/164/164 165/165/165 +f 165/165/165 168/168/168 167/167/167 +f 169/169/169 167/167/167 168/168/168 +f 164/164/164 170/170/170 166/166/166 +f 171/171/171 166/166/166 170/170/170 +f 171/171/171 170/170/170 172/172/172 +f 173/173/173 172/172/172 170/170/170 +f 176/176/176 175/175/175 174/174/174 +f 177/177/177 174/174/174 175/175/175 +f 177/177/177 175/175/175 178/178/178 +f 179/179/179 178/178/178 175/175/175 +f 174/174/174 180/180/180 176/176/176 +f 181/181/181 176/176/176 180/180/180 +f 180/180/180 182/182/182 181/181/181 +f 183/183/183 181/181/181 182/182/182 +f 186/186/186 185/185/185 184/184/184 +f 187/187/187 184/184/184 185/185/185 +f 185/185/185 186/186/186 188/188/188 +f 189/189/189 188/188/188 186/186/186 +f 188/188/188 189/189/189 190/190/190 +f 191/191/191 190/190/190 189/189/189 +f 191/191/191 192/192/192 190/190/190 +f 193/193/193 190/190/190 192/192/192 +f 196/196/196 195/195/195 194/194/194 +f 197/197/197 194/194/194 195/195/195 +f 200/200/200 199/199/199 198/198/198 +f 201/201/201 198/198/198 199/199/199 +f 200/200/200 202/202/202 199/199/199 +f 203/203/203 199/199/199 202/202/202 +f 202/202/202 204/204/204 203/203/203 +f 205/205/205 203/203/203 204/204/204 +f 208/208/208 207/207/207 206/206/206 +f 209/209/209 206/206/206 207/207/207 +f 206/206/206 210/210/210 208/208/208 +f 211/211/211 208/208/208 210/210/210 +f 210/210/210 212/212/212 211/211/211 +f 213/213/213 211/211/211 212/212/212 +f 216/216/216 215/215/215 214/214/214 +f 217/217/217 214/214/214 215/215/215 +f 216/216/216 218/218/218 215/215/215 +f 219/219/219 215/215/215 218/218/218 +f 218/218/218 220/220/220 219/219/219 +f 221/221/221 219/219/219 220/220/220 +f 224/224/224 223/223/223 222/222/222 +f 225/225/225 222/222/222 223/223/223 +f 228/228/228 227/227/227 226/226/226 +f 229/229/229 226/226/226 227/227/227 +f 228/228/228 230/230/230 227/227/227 +f 231/231/231 227/227/227 230/230/230 +f 230/230/230 232/232/232 231/231/231 +f 233/233/233 231/231/231 232/232/232 +f 236/236/236 235/235/235 234/234/234 +f 237/237/237 234/234/234 235/235/235 +f 240/240/240 239/239/239 238/238/238 +f 241/241/241 238/238/238 239/239/239 +f 240/240/240 242/242/242 239/239/239 +f 243/243/243 239/239/239 242/242/242 +f 242/242/242 244/244/244 243/243/243 +f 245/245/245 243/243/243 244/244/244 +f 248/248/248 247/247/247 246/246/246 +f 249/249/249 246/246/246 247/247/247 +f 248/248/248 250/250/250 247/247/247 +f 251/251/251 247/247/247 250/250/250 +f 250/250/250 252/252/252 251/251/251 +f 253/253/253 251/251/251 252/252/252 +f 256/256/256 255/255/255 254/254/254 +f 257/257/257 254/254/254 255/255/255 +f 255/255/255 258/258/258 257/257/257 +f 259/259/259 257/257/257 258/258/258 +f 259/259/259 258/258/258 260/260/260 +f 261/261/261 260/260/260 258/258/258 +f 264/264/264 263/263/263 262/262/262 +f 265/265/265 262/262/262 263/263/263 +f 264/264/264 266/266/266 263/263/263 +f 267/267/267 263/263/263 266/266/266 +f 267/267/267 266/266/266 268/268/268 +f 269/269/269 268/268/268 266/266/266 +f 272/272/272 271/271/271 270/270/270 +f 273/273/273 270/270/270 271/271/271 +f 270/270/270 273/273/273 274/274/274 +f 275/275/275 274/274/274 273/273/273 +f 278/278/278 277/277/277 276/276/276 +f 279/279/279 276/276/276 277/277/277 +f 277/277/277 280/280/280 279/279/279 +f 281/281/281 279/279/279 280/280/280 +f 280/280/280 282/282/282 281/281/281 +f 283/283/283 281/281/281 282/282/282 +f 283/283/283 282/282/282 284/284/284 +f 285/285/285 284/284/284 282/282/282 +f 288/288/288 287/287/287 286/286/286 +f 289/289/289 286/286/286 287/287/287 +f 286/286/286 289/289/289 290/290/290 +f 291/291/291 290/290/290 289/289/289 +f 294/294/294 293/293/293 292/292/292 +f 295/295/295 292/292/292 293/293/293 +f 293/293/293 294/294/294 296/296/296 +f 297/297/297 296/296/296 294/294/294 +f 297/297/297 298/298/298 296/296/296 +f 299/299/299 296/296/296 298/298/298 +f 298/298/298 300/300/300 299/299/299 +f 301/301/301 299/299/299 300/300/300 +f 304/304/304 303/303/303 302/302/302 +f 305/305/305 302/302/302 303/303/303 +f 308/308/308 307/307/307 306/306/306 +f 309/309/309 306/306/306 307/307/307 +f 308/308/308 310/310/310 307/307/307 +f 311/311/311 307/307/307 310/310/310 +f 314/314/314 313/313/313 312/312/312 +f 315/315/315 312/312/312 313/313/313 +f 313/313/313 316/316/316 315/315/315 +f 317/317/317 315/315/315 316/316/316 +f 320/320/320 319/319/319 318/318/318 +f 321/321/321 318/318/318 319/319/319 +f 320/320/320 322/322/322 319/319/319 +f 323/323/323 319/319/319 322/322/322 +f 326/326/326 325/325/325 324/324/324 +f 327/327/327 324/324/324 325/325/325 +f 326/326/326 328/328/328 325/325/325 +f 329/329/329 325/325/325 328/328/328 +f 332/332/332 331/331/331 330/330/330 +f 333/333/333 330/330/330 331/331/331 +f 336/336/336 335/335/335 334/334/334 +f 337/337/337 334/334/334 335/335/335 +f 340/340/340 339/339/339 338/338/338 +f 341/341/341 338/338/338 339/339/339 +f 344/344/344 343/343/343 342/342/342 +f 345/345/345 342/342/342 343/343/343 +f 348/348/348 347/347/347 346/346/346 +f 349/349/349 346/346/346 347/347/347 +f 352/352/352 351/351/351 350/350/350 +f 353/353/353 350/350/350 351/351/351 +f 356/356/356 355/355/355 354/354/354 +f 357/357/357 354/354/354 355/355/355 +f 360/360/360 359/359/359 358/358/358 +f 361/361/361 358/358/358 359/359/359 +f 364/364/364 363/363/363 362/362/362 +f 365/365/365 362/362/362 363/363/363 +f 368/368/368 367/367/367 366/366/366 +f 369/369/369 366/366/366 367/367/367 +f 372/372/372 371/371/371 370/370/370 +f 373/373/373 370/370/370 371/371/371 +f 376/376/376 375/375/375 374/374/374 +f 377/377/377 374/374/374 375/375/375 +f 380/380/380 379/379/379 378/378/378 +f 381/381/381 378/378/378 379/379/379 +f 380/380/380 382/382/382 379/379/379 +f 383/383/383 379/379/379 382/382/382 +f 382/382/382 384/384/384 383/383/383 +f 385/385/385 383/383/383 384/384/384 +f 388/388/388 387/387/387 386/386/386 +f 389/389/389 386/386/386 387/387/387 +f 388/388/388 390/390/390 387/387/387 +f 391/391/391 387/387/387 390/390/390 +f 390/390/390 392/392/392 391/391/391 +f 393/393/393 391/391/391 392/392/392 +f 396/396/396 395/395/395 394/394/394 +f 397/397/397 394/394/394 395/395/395 +f 395/395/395 398/398/398 397/397/397 +f 399/399/399 397/397/397 398/398/398 +f 399/399/399 398/398/398 400/400/400 +f 401/401/401 400/400/400 398/398/398 +f 404/404/404 403/403/403 402/402/402 +f 405/405/405 402/402/402 403/403/403 +f 404/404/404 406/406/406 403/403/403 +f 407/407/407 403/403/403 406/406/406 +f 407/407/407 406/406/406 408/408/408 +f 409/409/409 408/408/408 406/406/406 +f 412/412/412 411/411/411 410/410/410 +f 413/413/413 410/410/410 411/411/411 +f 412/412/412 414/414/414 411/411/411 +f 415/415/415 411/411/411 414/414/414 +f 414/414/414 416/416/416 415/415/415 +f 417/417/417 415/415/415 416/416/416 +f 420/420/420 419/419/419 418/418/418 +f 421/421/421 418/418/418 419/419/419 +f 420/420/420 422/422/422 419/419/419 +f 423/423/423 419/419/419 422/422/422 +f 422/422/422 424/424/424 423/423/423 +f 425/425/425 423/423/423 424/424/424 +f 428/428/428 427/427/427 426/426/426 +f 429/429/429 426/426/426 427/427/427 +f 427/427/427 430/430/430 429/429/429 +f 431/431/431 429/429/429 430/430/430 +f 431/431/431 430/430/430 432/432/432 +f 433/433/433 432/432/432 430/430/430 +f 436/436/436 435/435/435 434/434/434 +f 437/437/437 434/434/434 435/435/435 +f 436/436/436 438/438/438 435/435/435 +f 439/439/439 435/435/435 438/438/438 +f 439/439/439 438/438/438 440/440/440 +f 441/441/441 440/440/440 438/438/438 +f 444/444/444 443/443/443 442/442/442 +f 447/447/447 446/446/446 445/445/445 +f 450/450/450 449/449/449 448/448/448 +f 451/451/451 448/448/448 449/449/449 +f 448/448/448 452/452/452 450/450/450 +f 453/453/453 450/450/450 452/452/452 +f 456/456/456 455/455/455 454/454/454 +f 457/457/457 454/454/454 455/455/455 +f 460/460/460 459/459/459 458/458/458 +f 461/461/461 458/458/458 459/459/459 +f 464/464/464 463/463/463 462/462/462 +f 465/465/465 462/462/462 463/463/463 +f 468/468/468 467/467/467 466/466/466 +f 469/469/469 466/466/466 467/467/467 +f 467/467/467 470/470/470 469/469/469 +f 471/471/471 469/469/469 470/470/470 +f 474/474/474 473/473/473 472/472/472 +f 477/477/477 476/476/476 475/475/475 +f 480/480/480 479/479/479 478/478/478 +f 481/481/481 478/478/478 479/479/479 diff --git a/Unity/Assets/models/Obj_BenchD.obj.meta b/Unity/Assets/models/Obj_BenchD.obj.meta new file mode 100644 index 0000000..9a3ee9c --- /dev/null +++ b/Unity/Assets/models/Obj_BenchD.obj.meta @@ -0,0 +1,97 @@ +fileFormatVersion: 2 +guid: d2c78cd678e0ce9449ebc171f291defc +timeCreated: 1525080170 +licenseType: Free +ModelImporter: + serializedVersion: 22 + fileIDToRecycleName: + 100000: //RootNode + 100002: Obj_BenchD_0 + 400000: //RootNode + 400002: Obj_BenchD_0 + 2300000: Obj_BenchD_0 + 3300000: Obj_BenchD_0 + 4300000: Obj_BenchD_0 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Obj_BenchD_0Mat + second: {fileID: 2100000, guid: da570ecdf8da23648a1a922abadf89d4, type: 2} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 0 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/models/Obj_ChairA_Cin_LOD0.obj.meta b/Unity/Assets/models/Obj_ChairA_Cin_LOD0.obj.meta index 96d2dbc..bad4d2c 100644 --- a/Unity/Assets/models/Obj_ChairA_Cin_LOD0.obj.meta +++ b/Unity/Assets/models/Obj_ChairA_Cin_LOD0.obj.meta @@ -3,7 +3,7 @@ guid: 10d6bd1b4913a9942821f97d827ba4ec timeCreated: 1510988401 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: Obj_ChairA_Cin_LOD0 100002: //RootNode @@ -12,10 +12,17 @@ ModelImporter: 2300000: Obj_ChairA_Cin_LOD0 3300000: Obj_ChairA_Cin_LOD0 4300000: Obj_ChairA_Cin_LOD0 + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Obj_ChairA_Cin_LOD0Mat + second: {fileID: 2100000, guid: a9330fa5d268d2e4cb1a705e1db3b44c, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,20 +35,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -57,6 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 0 copyAvatar: 0 humanDescription: diff --git a/Unity/Assets/models/Obj_ChairWoodB.obj.meta b/Unity/Assets/models/Obj_ChairWoodB.obj.meta index 82bfbb8..7e0e818 100644 --- a/Unity/Assets/models/Obj_ChairWoodB.obj.meta +++ b/Unity/Assets/models/Obj_ChairWoodB.obj.meta @@ -3,7 +3,7 @@ guid: d9d3d436b54eca046a164ad7a0f67dc3 timeCreated: 1509991361 licenseType: Free ModelImporter: - serializedVersion: 19 + serializedVersion: 22 fileIDToRecycleName: 100000: Obj_ChairWoodB 100002: //RootNode @@ -12,10 +12,17 @@ ModelImporter: 2300000: Obj_ChairWoodB 3300000: Obj_ChairWoodB 4300000: Obj_ChairWoodB + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Obj_ChairWoodBMat + second: {fileID: 2100000, guid: fe4036e682616ba4cb9c6f7e164fd894, type: 2} materials: importMaterials: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -28,20 +35,25 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importVisibility: 0 + importBlendShapes: 0 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -52,11 +64,12 @@ ModelImporter: secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 - useFileScale: 1 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/VisualStudio/Properties/AssemblyInfo.cs b/VisualStudio/Properties/AssemblyInfo.cs index bb91ec0..e3ae8ad 100644 --- a/VisualStudio/Properties/AssemblyInfo.cs +++ b/VisualStudio/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Better-Placing")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("© 2018 WulfMarius")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0")] -[assembly: AssemblyFileVersion("2.0.0")] +[assembly: AssemblyVersion("2.1.0")] +[assembly: AssemblyFileVersion("2.1.0")] diff --git a/VisualStudio/src/BetterPlacing.cs b/VisualStudio/src/BetterPlacing.cs index 83910d6..830e65c 100644 --- a/VisualStudio/src/BetterPlacing.cs +++ b/VisualStudio/src/BetterPlacing.cs @@ -35,6 +35,24 @@ internal static void AddGearItemsToPhysicalCollisionMask() Utils.m_PhysicalCollisionLayerMask |= 1 << vp_Layer.Gear; } + internal static void AddNpcToPhysicalCollisionMask() + { + Utils.m_PhysicalCollisionLayerMask |= 1 << vp_Layer.NPC; + } + + internal static void ChangeLayer(GameObject gameObject, int from, int to) + { + if (gameObject.layer == from) + { + gameObject.layer = to; + } + + foreach (Transform eachChild in gameObject.transform) + { + ChangeLayer(eachChild.gameObject, from, to); + } + } + internal static void InitializeRotation(PlayerManager playerManager) { BetterPlacing.playerManager = playerManager; @@ -102,17 +120,6 @@ internal static bool IsStackableGearItem(GameObject gameObject) return true; } - internal static void PrepareGearItem(GameObject gameObject) - { - if (gameObject == null) - { - return; - } - - FixBoxCollider(gameObject); - RemoveNoCollidePlayer(gameObject); - } - internal static void PrepareGearItems() { GearItem[] gearItems = Resources.FindObjectsOfTypeAll(); @@ -120,14 +127,17 @@ internal static void PrepareGearItems() { if (IsStackableGearItem(eachGearItem.gameObject)) { - PrepareGearItem(eachGearItem.gameObject); + FixBoxCollider(eachGearItem.gameObject); } } + + RemovePickupHelper(Resources.Load("GEAR_WoodMatches")); + RemovePickupHelper(Resources.Load("GEAR_PackMatches")); } internal static void PreparePlacableFurniture(GameObject gameObject) { - if (!gameObject.GetComponent().isPartOfStaticBatch) + if (!gameObject.GetComponentInChildren().isPartOfStaticBatch) { return; } @@ -139,9 +149,14 @@ internal static void PreparePlacableFurniture(GameObject gameObject) } MeshFilter templateMeshFilter = prefab.GetComponentInChildren(); - gameObject.GetComponent().mesh = templateMeshFilter.mesh; - BoxCollider[] templateBoxColliders = prefab.GetComponents(); + MeshFilter[] meshFilters = gameObject.GetComponentsInChildren(); + foreach (MeshFilter eachMeshFilter in meshFilters) + { + eachMeshFilter.mesh = templateMeshFilter.mesh; + } + + BoxCollider[] templateBoxColliders = prefab.GetComponentsInChildren(); foreach (BoxCollider eachTemplateBoxCollider in templateBoxColliders) { BoxCollider boxCollider = gameObject.AddComponent(); @@ -161,10 +176,20 @@ internal static void RemoveGearItemsFromPhysicalCollisionMask() Utils.m_PhysicalCollisionLayerMask &= ~(1 << vp_Layer.Gear); } + internal static void RemoveNpcFromPhysiclaCollisionMask() + { + Utils.m_PhysicalCollisionLayerMask &= ~(1 << vp_Layer.NPC); + } + internal static void RestoreFurnitureLayers(GameObject furniture) { - vp_Layer.Set(furniture, vp_Layer.InteractiveProp, true); - vp_Layer.Set(furniture, vp_Layer.Default, false); + vp_Layer.Set(furniture, vp_Layer.Default, true); + + BreakDown breakDown = furniture.GetComponentInChildren(); + if (breakDown != null) + { + vp_Layer.Set(breakDown.gameObject, vp_Layer.InteractiveProp); + } } internal static void RestoreLastValidTransform(GameObject gameObject) @@ -244,6 +269,11 @@ private static void AddTranslations() private static void FixBoxCollider(GameObject gameObject) { + if (gameObject == null) + { + return; + } + BoxCollider boxCollider = gameObject.GetComponentInChildren(); if (boxCollider == null) { @@ -255,6 +285,11 @@ private static void FixBoxCollider(GameObject gameObject) MeshFilter[] meshFilters = gameObject.GetComponentsInChildren(); foreach (MeshFilter eachMeshFilter in meshFilters) { + if (eachMeshFilter.transform.parent && "OpenedMesh" == eachMeshFilter.transform.parent.name) + { + continue; + } + GameObject transformObject = new GameObject(); transformObject.transform.localRotation = eachMeshFilter.transform.localRotation; transformObject.transform.localScale = eachMeshFilter.transform.localScale; @@ -314,15 +349,20 @@ private static List GetGearItemsAbove(GameObject gameObject, Collide return result; } - private static void RemoveNoCollidePlayer(GameObject gameObject) + private static void RemovePickupHelper(GameObject gameObject) { - foreach (Transform eachTransform in gameObject.transform) + if (gameObject == null) { - if (eachTransform.gameObject.layer == vp_Layer.NoCollidePlayer) - { - Object.Destroy(eachTransform.gameObject); - } + return; + } + + Transform pickupHelper = gameObject.transform.Find("PickupHelper"); + if (pickupHelper == null) + { + return; } + + Object.Destroy(pickupHelper.GetComponent()); } private static void SetRotation(Quaternion rotation) diff --git a/VisualStudio/src/Patches.cs b/VisualStudio/src/Patches.cs index 1248e08..51fa824 100644 --- a/VisualStudio/src/Patches.cs +++ b/VisualStudio/src/Patches.cs @@ -136,10 +136,10 @@ public static bool Prefix(BreakDown __instance, ref string __result) } } - [HarmonyPatch(typeof(Panel_MainMenu), "Awake")] - internal class Panel_MainMenu_Awake + [HarmonyPatch(typeof(GearManager), "Reset")] + internal class GearManager_Reset { - public static void Postfix() + public static void Prefix() { BetterPlacing.PrepareGearItems(); } @@ -151,6 +151,7 @@ internal class PlayerManager_DoPositionCheck public static void Prefix(PlayerManager __instance) { var gameObject = __instance.GetObjectToPlace(); + if (BetterPlacing.IsStackableGearItem(gameObject)) { BetterPlacing.AddGearItemsToPhysicalCollisionMask(); @@ -214,6 +215,12 @@ private static void Prefix(PlayerManager __instance) BetterPlacing.AddFurnitureToPhysicalCollisionMask(); BetterPlacing.RestoreFurnitureLayers(gameObject); } + + CookingPotItem[] items = Object.FindObjectsOfType(); + foreach (var eachItem in items) + { + vp_Layer.Set(eachItem.gameObject, vp_Layer.Gear, true); + } } } @@ -228,7 +235,13 @@ public static bool Prefix(PlayerManager __instance) { BetterPlacing.PreparePlacableFurniture(gameObject); - __instance.StartPlaceMesh(gameObject.transform.parent.gameObject, 5f, false); + LODGroup lodGroup = gameObject.GetComponentInParent(); + if (lodGroup != null) + { + gameObject = lodGroup.gameObject; + } + + __instance.StartPlaceMesh(gameObject, 5f, false); return false; } @@ -242,6 +255,8 @@ internal class PlayerManager_ObjectToPlaceOverlapsWithObjectsThatBlockPlacement { public static bool Prefix(PlayerManager __instance, ref bool __result) { + BetterPlacing.AddNpcToPhysicalCollisionMask(); + var gameObject = __instance.GetObjectToPlace(); if (!BetterPlacing.IsPlaceableFurniture(gameObject)) { @@ -278,6 +293,11 @@ public static bool Prefix(PlayerManager __instance, ref bool __result) __result = false; return false; } + + public static void Postfix() + { + BetterPlacing.RemoveNpcFromPhysiclaCollisionMask(); + } } [HarmonyPatch(typeof(PlayerManager), "ProcessInspectablePickupItem")] @@ -307,12 +327,11 @@ private static void Postfix(PlayerManager __instance, GameObject objectToPlace, if (BetterPlacing.IsStackableGearItem(objectToPlace)) { - BetterPlacing.PrepareGearItem(objectToPlace); - objectToPlace.layer = vp_Layer.IgnoreRaycast; + objectToPlace.layer = vp_Layer.NPC; } else if (BetterPlacing.IsPlaceableFurniture(objectToPlace)) { - vp_Layer.Set(objectToPlace, vp_Layer.IgnoreRaycast, true); + vp_Layer.Set(objectToPlace, vp_Layer.NPC, true); } } } @@ -326,10 +345,61 @@ private static bool Prefix(PlayerManager __instance, GameObject objectToPlace, r return false; } + CookingPotItem[] items = Object.FindObjectsOfType(); + foreach (var eachItem in items) + { + if (eachItem.AttachedFireIsBurning()) + { + vp_Layer.Set(eachItem.gameObject, vp_Layer.NPC, true); + } + } + return true; } } + [HarmonyPatch(typeof(Campfire), "Awake")] + internal class Campfire_Awake + { + internal static void Postfix(Campfire __instance) + { + BetterPlacing.ChangeLayer(__instance.gameObject, vp_Layer.Gear, vp_Layer.NPC); + } + } + + [HarmonyPatch(typeof(GearPlacePoint), "AddDefaultCapsuleCollider")] + internal class GearPlacePoint_AddDefaultCapsuleCollider + { + internal static IEnumerable Transpiler(IEnumerable instructions) + { + List codeInstructions = new List(instructions); + + for (int i = 0; i < codeInstructions.Count; i++) + { + CodeInstruction codeInstruction = codeInstructions[i]; + + if (codeInstruction.opcode != OpCodes.Call && codeInstruction.opcode != OpCodes.Callvirt) + { + continue; + } + + MethodInfo methodInfo = codeInstruction.operand as MethodInfo; + if (methodInfo == null) + { + continue; + } + + if (methodInfo.Name == "set_layer" && methodInfo.DeclaringType == typeof(GameObject) && methodInfo.GetParameters().Length == 1) + { + codeInstructions[i - 1].operand = vp_Layer.NPC; + break; + } + } + + return instructions; + } + } + [HarmonyPatch(typeof(Wind), "IsPositionOccludedFromWind")] internal class Wind_IsPositionOccludedFromWind {