diff --git a/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat b/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat index 117b25d..57abd63 100644 --- a/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat +++ b/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_TrimSheet1 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP _SPECULAR_SETUP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 011afa5d5d2b862499f741807466bfa1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta index 618783f..4c9b970 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta @@ -3,7 +3,12 @@ guid: fc2b5b7551ec86542b748c3a88b39485 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta index 543bcd2..74bad2a 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta @@ -3,7 +3,12 @@ guid: e2ba213e3a7832f409428e2817b1fcf7 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta index c464cf8..ef5877e 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta @@ -3,7 +3,12 @@ guid: 7b6c80936da89a0488c79b8f1ca951e7 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta index e74eeb3..65d5fec 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta @@ -3,7 +3,12 @@ guid: 4a31c57c3ca869448a5849436b526efa ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta index 6c358bb..a85b30a 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta @@ -3,7 +3,12 @@ guid: e73358a549de9664fa0a48ccdea07e1c ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta index 408a497..797ffc8 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta @@ -3,7 +3,12 @@ guid: a3943167b6b50f34294c6a0efd56b89d ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta index 7b4af6c..171a811 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta @@ -3,7 +3,12 @@ guid: e20114b5c13a067488940c5cc8e13b60 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta b/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta index b911428..433a745 100644 --- a/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta +++ b/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta @@ -3,7 +3,22 @@ guid: 4477ff34c18408448b17cab051fbb946 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_UE4Man_Body + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_UE4Man_ChestLogo + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert1 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/BLOCKOUT/DropRoomBlockout.fbx.meta b/game/Assets/BLOCKOUT/DropRoomBlockout.fbx.meta index 500b141..704be67 100644 --- a/game/Assets/BLOCKOUT/DropRoomBlockout.fbx.meta +++ b/game/Assets/BLOCKOUT/DropRoomBlockout.fbx.meta @@ -3,7 +3,12 @@ guid: 105102b664704c74f8c687a1ad3661e7 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn1 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/BLOCKOUT/EntranceBlockout.fbx.meta b/game/Assets/BLOCKOUT/EntranceBlockout.fbx.meta index 4ec66a0..3e39951 100644 --- a/game/Assets/BLOCKOUT/EntranceBlockout.fbx.meta +++ b/game/Assets/BLOCKOUT/EntranceBlockout.fbx.meta @@ -3,7 +3,42 @@ guid: a3cc3b952ba63484cbf7efb18af70b0f ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn1 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn3 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn4 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn5 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn6 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert1 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/BLOCKOUT/Temple2.fbx.meta b/game/Assets/BLOCKOUT/Temple2.fbx.meta index 665d8ae..5dcdf61 100644 --- a/game/Assets/BLOCKOUT/Temple2.fbx.meta +++ b/game/Assets/BLOCKOUT/Temple2.fbx.meta @@ -3,7 +3,22 @@ guid: 41f93c9892597e7438da812cafe993d4 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn1 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn3 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert1 + second: {fileID: 2100000, guid: 993d425dfb4b11f4e98ac6e7e4023de0, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/Materials/Simple.mat b/game/Assets/Materials/Simple.mat new file mode 100644 index 0000000..9dc1c48 --- /dev/null +++ b/game/Assets/Materials/Simple.mat @@ -0,0 +1,124 @@ +%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: Simple + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + 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.6415094, g: 0.6415094, b: 0.6415094, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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 &6326251001475188071 +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/game/Assets/Materials/Simple.mat.meta b/game/Assets/Materials/Simple.mat.meta new file mode 100644 index 0000000..75d546f --- /dev/null +++ b/game/Assets/Materials/Simple.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 993d425dfb4b11f4e98ac6e7e4023de0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: