diff --git a/Assets/Other/Delta (Toomas) v0.blend b/Assets/Other/Delta (Toomas) v0.blend index 0ecf6dde..7e87074f 100644 --- a/Assets/Other/Delta (Toomas) v0.blend +++ b/Assets/Other/Delta (Toomas) v0.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59583efe65db63c3d8886ce53bf834c4d90e7d7b3756f69fa462564a565a2008 -size 10579720 +oid sha256:cfa7431caf1f52d3de0122c758cf51d69108826f5da71a8865c8252d1590f17d +size 10582400 diff --git a/Assets/Other/Delta (Toomas) v0.blend.meta b/Assets/Other/Delta (Toomas) v0.blend.meta index 0bfc820e..370597a9 100644 --- a/Assets/Other/Delta (Toomas) v0.blend.meta +++ b/Assets/Other/Delta (Toomas) v0.blend.meta @@ -228,7 +228,7 @@ ModelImporter: materialImportMode: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 diff --git a/Assets/Other/Delta (Toomas) v0.blend1 b/Assets/Other/Delta (Toomas) v0.blend1 index cc2fc0d6..b8ca4ce5 100644 Binary files a/Assets/Other/Delta (Toomas) v0.blend1 and b/Assets/Other/Delta (Toomas) v0.blend1 differ diff --git a/Assets/Other/Materials/material_54.mat b/Assets/Other/Materials/material_54.mat new file mode 100644 index 00000000..0eccbd15 --- /dev/null +++ b/Assets/Other/Materials/material_54.mat @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: material_54 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.745098, g: 0.552941, b: 0.270588, a: 1} + - _Color: {r: 0.745098, g: 0.552941, b: 0.270588, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &3908121633204006978 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/Assets/Other/Materials/material_54.mat.meta b/Assets/Other/Materials/material_54.mat.meta new file mode 100644 index 00000000..070f30cc --- /dev/null +++ b/Assets/Other/Materials/material_54.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ad9acdc3600e5c47a6f2f827980281a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Mesh Test.unity similarity index 92% rename from Assets/Scenes/Test.unity rename to Assets/Scenes/Mesh Test.unity index 463559fb..463ec794 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Mesh Test.unity @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &715164239 +--- !u!1 &179461364 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,8 +131,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 715164241} - - component: {fileID: 715164240} + - component: {fileID: 179461366} + - component: {fileID: 179461365} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -140,13 +140,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &715164240 +--- !u!108 &179461365 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 715164239} + m_GameObject: {fileID: 179461364} m_Enabled: 1 serializedVersion: 10 m_Type: 1 @@ -199,15 +199,16 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!4 &715164241 +--- !u!4 &179461366 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 715164239} + m_GameObject: {fileID: 179461364} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -215,7 +216,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1694599151 +--- !u!1 &1277742568 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -223,9 +224,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1694599154} - - component: {fileID: 1694599153} - - component: {fileID: 1694599152} + - component: {fileID: 1277742571} + - component: {fileID: 1277742570} + - component: {fileID: 1277742569} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -233,21 +234,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1694599152 +--- !u!81 &1277742569 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1694599151} + m_GameObject: {fileID: 1277742568} m_Enabled: 1 ---- !u!20 &1694599153 +--- !u!20 &1277742570 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1694599151} + m_GameObject: {fileID: 1277742568} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -284,13 +285,13 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &1694599154 +--- !u!4 &1277742571 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1694599151} + m_GameObject: {fileID: 1277742568} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} diff --git a/Assets/Scenes/Test.unity.meta b/Assets/Scenes/Mesh Test.unity.meta similarity index 74% rename from Assets/Scenes/Test.unity.meta rename to Assets/Scenes/Mesh Test.unity.meta index 03d48ae9..370ee148 100644 --- a/Assets/Scenes/Test.unity.meta +++ b/Assets/Scenes/Mesh Test.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6961c0c108584e34da2a607ee67ecdc1 +guid: a517ae139da704b4088d3e41694f371a DefaultImporter: externalObjects: {} userData: