From e1bf674c16e3c8472b29574159c789cd3f0c64e0 Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Fri, 24 Feb 2017 09:32:20 -0800 Subject: Updating to blast_source-windows@1.0.347-21749006 and blast_tools_and_samples-windows@1.0.347-21749006 with a new directory structure. NvBlast folder is gone, files have been moved to top level directory. README is changed to reflect this. --- .../UnityExample/Assets/Materials/CubeMaterial.mat | 127 -------------------- .../Assets/Materials/CubeMaterial.mat.meta | 8 -- .../Assets/Materials/HitToolMaterial.mat | 128 --------------------- .../Assets/Materials/HitToolMaterial.mat.meta | 8 -- 4 files changed, 271 deletions(-) delete mode 100644 NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat delete mode 100644 NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat.meta delete mode 100644 NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat delete mode 100644 NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat.meta (limited to 'NvBlast/examples/UnityExample/Assets/Materials') diff --git a/NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat b/NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat deleted file mode 100644 index d5b3782..0000000 --- a/NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat +++ /dev/null @@ -1,127 +0,0 @@ -%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: CubeMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 1 - m_CustomRenderQueue: -1 - stringTagMap: {} - m_SavedProperties: - serializedVersion: 2 - m_TexEnvs: - - first: - name: _BumpMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _DetailAlbedoMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _DetailMask - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _DetailNormalMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _EmissionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _MetallicGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _OcclusionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _GlossMapScale - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _GlossyReflections - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SmoothnessTextureChannel - second: 0 - - first: - name: _SpecularHighlights - second: 1 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 - m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} diff --git a/NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat.meta b/NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat.meta deleted file mode 100644 index c09f976..0000000 --- a/NvBlast/examples/UnityExample/Assets/Materials/CubeMaterial.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 737d44acaf66b744197a3bf85c73a150 -timeCreated: 1483016941 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat b/NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat deleted file mode 100644 index 8fe71b4..0000000 --- a/NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat +++ /dev/null @@ -1,128 +0,0 @@ -%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: HitToolMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION - m_LightmapFlags: 1 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - m_SavedProperties: - serializedVersion: 2 - m_TexEnvs: - - first: - name: _BumpMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _DetailAlbedoMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _DetailMask - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _DetailNormalMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _EmissionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _MetallicGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _OcclusionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 10 - - first: - name: _GlossMapScale - second: 1 - - first: - name: _Glossiness - second: 0 - - first: - name: _GlossyReflections - second: 1 - - first: - name: _Metallic - second: 0.156 - - first: - name: _Mode - second: 3 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SmoothnessTextureChannel - second: 0 - - first: - name: _SpecularHighlights - second: 1 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 0 - m_Colors: - - first: - name: _Color - second: {r: 1, g: 0, b: 0, a: 0.259} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} diff --git a/NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat.meta b/NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat.meta deleted file mode 100644 index da8036a..0000000 --- a/NvBlast/examples/UnityExample/Assets/Materials/HitToolMaterial.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 680819e140a18024bba58e6fdc3651d2 -timeCreated: 1483016941 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3