diff --git a/Assets/Models/Materials/0,116,120.mat b/Assets/Models/Materials/0,116,120.mat deleted file mode 100644 index c7641cd..0000000 --- a/Assets/Models/Materials/0,116,120.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 0,116,120 - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - 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: 2800000, guid: 626c65308dddb804abfdc4615d813f31, type: 3} - 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_Ints: [] - 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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/0,116,120.mat.meta b/Assets/Models/Materials/0,116,120.mat.meta deleted file mode 100644 index c6b2996..0000000 --- a/Assets/Models/Materials/0,116,120.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cbe3cde46aad0e94faa492d2b69e8703 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Materials/191,191,191.mat b/Assets/Models/Materials/191,191,191.mat deleted file mode 100644 index 9e5582b..0000000 --- a/Assets/Models/Materials/191,191,191.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 191,191,191 - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - 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: 2800000, guid: 13f2ecee82b9fd548a25f9719e89abe2, type: 3} - 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_Ints: [] - 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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/191,191,191.mat.meta b/Assets/Models/Materials/191,191,191.mat.meta deleted file mode 100644 index 4460be0..0000000 --- a/Assets/Models/Materials/191,191,191.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a56d7a9d23d6e024b82ef32a0c10d4ff -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Materials/237,237,231.mat b/Assets/Models/Materials/237,237,231.mat deleted file mode 100644 index 626e476..0000000 --- a/Assets/Models/Materials/237,237,231.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 237,237,231 - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - 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: 2800000, guid: 626c65308dddb804abfdc4615d813f31, type: 3} - 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_Ints: [] - 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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/237,237,231.mat.meta b/Assets/Models/Materials/237,237,231.mat.meta deleted file mode 100644 index 819e951..0000000 --- a/Assets/Models/Materials/237,237,231.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e58abb58186f4e4ea34a22754ea4396 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Materials/5,5,5.mat b/Assets/Models/Materials/5,5,5.mat deleted file mode 100644 index 7149b19..0000000 --- a/Assets/Models/Materials/5,5,5.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 5,5,5 - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - 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: 2800000, guid: 75b18e068c1fd3c45b81ba21ada61e07, type: 3} - 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_Ints: [] - 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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/5,5,5.mat.meta b/Assets/Models/Materials/5,5,5.mat.meta deleted file mode 100644 index 1f9b4a3..0000000 --- a/Assets/Models/Materials/5,5,5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5b05a6587a1b2794596d509431f66139 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Materials/Material.001.mat b/Assets/Models/Materials/Material.001.mat index 89dd44d..b32337e 100644 --- a/Assets/Models/Materials/Material.001.mat +++ b/Assets/Models/Materials/Material.001.mat @@ -44,8 +44,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: ec0a09641a1c1e1468e5590931118227, type: 3} - m_Scale: {x: 10, y: 10} + m_Texture: {fileID: 2800000, guid: e8f869eb78435b04b96cd129546a5766, type: 3} + m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/Assets/Models/Materials/Material.001.mat.meta b/Assets/Models/Materials/Material.001.mat.meta index 38a5f05..8dc1867 100644 --- a/Assets/Models/Materials/Material.001.mat.meta +++ b/Assets/Models/Materials/Material.001.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf81b9f8f1fe4314ea9d046bb2cbe99b +guid: 82febf23f0ab3a24fa349d4cf3828afa NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Models/Materials/SANDIA Reflective.mat b/Assets/Models/Materials/SANDIA Reflective.mat deleted file mode 100644 index 6ee01ce..0000000 --- a/Assets/Models/Materials/SANDIA Reflective.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SANDIA Reflective - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - 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: 2800000, guid: 6e76c4d817a272e49a5ccf62d28d6b6a, type: 3} - 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_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/SANDIA Reflective.mat.meta b/Assets/Models/Materials/SANDIA Reflective.mat.meta deleted file mode 100644 index b96b9d8..0000000 --- a/Assets/Models/Materials/SANDIA Reflective.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ac505a09fc88bb24a9c4da049cbb562e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Materials/SANDIA non reflective.mat b/Assets/Models/Materials/SANDIA non reflective.mat index ce64e52..8149418 100644 --- a/Assets/Models/Materials/SANDIA non reflective.mat +++ b/Assets/Models/Materials/SANDIA non reflective.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: f94a7a3257b977345b67db72019cd091, type: 3} + m_Texture: {fileID: 2800000, guid: ccce0ef1aec1a074aa921bb393bc65e7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Sandia.fbx b/Assets/Models/Sandia.fbx index c5db386..1b656ff 100644 --- a/Assets/Models/Sandia.fbx +++ b/Assets/Models/Sandia.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:458d47fc8130a8c4e87064a86eb4e7a675a7c66f54ebe4bcf6dda28aad2f159c -size 139480492 +oid sha256:2066316919b7bc620b2df1861927931ed308933fe9e5ab32d910dd3ca45af3a5 +size 120385484 diff --git a/Assets/Models/Sandia.fbx.meta b/Assets/Models/Sandia.fbx.meta index 0fa8275..b38b12d 100644 --- a/Assets/Models/Sandia.fbx.meta +++ b/Assets/Models/Sandia.fbx.meta @@ -8,7 +8,7 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Material.001 - second: {fileID: 2100000, guid: cf81b9f8f1fe4314ea9d046bb2cbe99b, type: 2} + second: {fileID: 2100000, guid: 82febf23f0ab3a24fa349d4cf3828afa, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -18,17 +18,17 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: SANDIA Color alt - second: {fileID: 2800000, guid: f94a7a3257b977345b67db72019cd091, type: 3} + second: {fileID: 2800000, guid: ccce0ef1aec1a074aa921bb393bc65e7, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: SANDIA Roughness - second: {fileID: 2800000, guid: bb79d381440fc144bb0b75d1012cc683, type: 3} + second: {fileID: 2800000, guid: 79021ac3b25586e41b4de8036ee635de, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: fabric-textured-background - second: {fileID: 2800000, guid: ec0a09641a1c1e1468e5590931118227, type: 3} + name: SANDIA Velvet alt + second: {fileID: 2800000, guid: e8f869eb78435b04b96cd129546a5766, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -68,8 +68,8 @@ ModelImporter: importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 diff --git a/Assets/Models/TOTU Coffe Table 104.fbx.meta b/Assets/Models/TOTU Coffe Table 104.fbx.meta index cdbcc81..a059104 100644 --- a/Assets/Models/TOTU Coffe Table 104.fbx.meta +++ b/Assets/Models/TOTU Coffe Table 104.fbx.meta @@ -4,41 +4,21 @@ ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: 0,116,120 - second: {fileID: 2100000, guid: cbe3cde46aad0e94faa492d2b69e8703, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: 0,116,120.001 second: {fileID: 2100000, guid: bd2d29398ed50954981410baeb8555d7, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: 191,191,191 - second: {fileID: 2100000, guid: a56d7a9d23d6e024b82ef32a0c10d4ff, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: 191,191,191.001 second: {fileID: 2100000, guid: 41dec5500a8d2564da28ea38491f1e49, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: 237,237,231 - second: {fileID: 2100000, guid: 5e58abb58186f4e4ea34a22754ea4396, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: 237,237,231.001 second: {fileID: 2100000, guid: addb1be4c5047fe44b642ebb8f618e0a, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: 5,5,5 - second: {fileID: 2100000, guid: 5b05a6587a1b2794596d509431f66139, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule diff --git a/Assets/Models/Textures/SANDIA Color alt.png.meta b/Assets/Models/Textures/SANDIA Color alt.png.meta index 3994c2b..aa1bd22 100644 --- a/Assets/Models/Textures/SANDIA Color alt.png.meta +++ b/Assets/Models/Textures/SANDIA Color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f94a7a3257b977345b67db72019cd091 +guid: ccce0ef1aec1a074aa921bb393bc65e7 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA Color.png b/Assets/Models/Textures/SANDIA Color.png deleted file mode 100644 index 651322f..0000000 Binary files a/Assets/Models/Textures/SANDIA Color.png and /dev/null differ diff --git a/Assets/Models/Textures/SANDIA Roughness.png.meta b/Assets/Models/Textures/SANDIA Roughness.png.meta index e3bef87..bcafb28 100644 --- a/Assets/Models/Textures/SANDIA Roughness.png.meta +++ b/Assets/Models/Textures/SANDIA Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb79d381440fc144bb0b75d1012cc683 +guid: 79021ac3b25586e41b4de8036ee635de TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA UV.png b/Assets/Models/Textures/SANDIA UV.png deleted file mode 100644 index f7ed095..0000000 Binary files a/Assets/Models/Textures/SANDIA UV.png and /dev/null differ diff --git a/Assets/Models/Textures/SANDIA UV.png.meta b/Assets/Models/Textures/SANDIA UV.png.meta deleted file mode 100644 index bea9241..0000000 --- a/Assets/Models/Textures/SANDIA UV.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 5dd40be1042720048892d0ca30b70df1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Textures/fabric-textured-background.jpg b/Assets/Models/Textures/SANDIA Velvet alt.png similarity index 58% rename from Assets/Models/Textures/fabric-textured-background.jpg rename to Assets/Models/Textures/SANDIA Velvet alt.png index a043f4a..4d3f8e2 100644 Binary files a/Assets/Models/Textures/fabric-textured-background.jpg and b/Assets/Models/Textures/SANDIA Velvet alt.png differ diff --git a/Assets/Models/Textures/SANDIA Color.png.meta b/Assets/Models/Textures/SANDIA Velvet alt.png.meta similarity index 98% rename from Assets/Models/Textures/SANDIA Color.png.meta rename to Assets/Models/Textures/SANDIA Velvet alt.png.meta index 89a4928..1295cfc 100644 --- a/Assets/Models/Textures/SANDIA Color.png.meta +++ b/Assets/Models/Textures/SANDIA Velvet alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e76c4d817a272e49a5ccf62d28d6b6a +guid: e8f869eb78435b04b96cd129546a5766 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/fabric-textured-background.jpg.meta b/Assets/Models/Textures/fabric-textured-background.jpg.meta deleted file mode 100644 index 6665b74..0000000 --- a/Assets/Models/Textures/fabric-textured-background.jpg.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: ec0a09641a1c1e1468e5590931118227 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/Sandia.prefab b/Assets/Prefab/Sandia.prefab index 1e47bc9..1a75532 100644 --- a/Assets/Prefab/Sandia.prefab +++ b/Assets/Prefab/Sandia.prefab @@ -8,33 +8,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.y - value: -0.32 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.804 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.x @@ -42,7 +30,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.z @@ -54,16 +42,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4856827502284789080, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_Layer value: 6 @@ -102,14 +86,14 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3} insertIndex: -1 - addedObject: {fileID: 6850552232023683413} + addedObject: {fileID: 3848558690108251817} m_SourcePrefab: {fileID: 100100000, guid: a159887176eca8843a8a9a42b862cbee, type: 3} --- !u!1 &2415200880001261083 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3} m_PrefabInstance: {fileID: 3262274873550086986} m_PrefabAsset: {fileID: 0} ---- !u!65 &6850552232023683413 +--- !u!65 &3848558690108251817 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -128,5 +112,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.7211628, y: 0.74265003, z: 1.2384603} - m_Center: {x: -0.001181243, y: 0.5819857, z: -0.04840074} + m_Size: {x: 2.7314172, y: 0.747852, z: 1.2305349} + m_Center: {x: -0.001200676, y: 0.3686166, z: 0.04802829}