diff --git a/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat b/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat deleted file mode 100644 index de8df94..0000000 --- a/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-5745916881453277144 -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: 7 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Desert Portal Entrance - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION - - _METALLICSPECGLOSSMAP - - _NORMALMAP - - _OCCLUSIONMAP - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 531fd494704381e42b4c62263983734a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 183a2c62f01ebb94aaa4f65cb4338971, type: 3} - 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: 2800000, guid: a63c413ea6030af438853c6186a65b71, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 531fd494704381e42b4c62263983734a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: 6f4e875a4a83b3b4a8758570a82fe568, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: e7e7527ae7d36324e91cb81f28cfecf6, type: 3} - 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_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 8, g: 3.5137255, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat.meta b/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat.meta deleted file mode 100644 index 62c8613..0000000 --- a/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8e1f11710a5e6d439d170b75393d0f2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Materials/Desert Portal.mat b/Assets/Desert/Assets/Materials/Desert Portal.mat index 6fbc0e4..27a90ce 100644 --- a/Assets/Desert/Assets/Materials/Desert Portal.mat +++ b/Assets/Desert/Assets/Materials/Desert Portal.mat @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6687307418442010721 +--- !u!114 &-5745916881453277144 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} @@ -42,11 +42,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 1d876fde6650ac54dbfdd2c5413a86ae, type: 3} + m_Texture: {fileID: 2800000, guid: 531fd494704381e42b4c62263983734a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: e80b7a5d5af62cf4c970b6e1f7e1b840, type: 3} + m_Texture: {fileID: 2800000, guid: 183a2c62f01ebb94aaa4f65cb4338971, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -62,19 +62,19 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 423f8ce2d10f7604f9eb19b684c812fa, type: 3} + m_Texture: {fileID: 2800000, guid: a63c413ea6030af438853c6186a65b71, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 1d876fde6650ac54dbfdd2c5413a86ae, type: 3} + m_Texture: {fileID: 2800000, guid: 531fd494704381e42b4c62263983734a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: dafbef7587de8f04c9fce3450bf204fc, type: 3} + m_Texture: {fileID: 2800000, guid: 6f4e875a4a83b3b4a8758570a82fe568, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: a2219ef4884c9f4409fdc64f127792f2, type: 3} + m_Texture: {fileID: 2800000, guid: e7e7527ae7d36324e91cb81f28cfecf6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_AlbedoTransparency.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_AlbedoTransparency.png similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_AlbedoTransparency.png rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_AlbedoTransparency.png diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_AlbedoTransparency.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_AlbedoTransparency.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Emission.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Emission.png similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Emission.png rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Emission.png diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Emission.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Emission.png.meta similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Emission.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Emission.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_MetallicSmoothness.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_MetallicSmoothness.png similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_MetallicSmoothness.png rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_MetallicSmoothness.png diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_MetallicSmoothness.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_MetallicSmoothness.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Normal.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Normal.png similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Normal.png rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Normal.png diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Normal.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Normal.png.meta similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Normal.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Normal.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Occlusion.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Occlusion.png similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Occlusion.png rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Occlusion.png diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Occlusion.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Occlusion.png.meta similarity index 100% rename from Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal Entrance_Portal Frame Exit_Occlusion.png.meta rename to Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame Exit_Occlusion.png.meta diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_AlbedoTransparency.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_AlbedoTransparency.png deleted file mode 100644 index 06c3088..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_AlbedoTransparency.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9681a40c9a0f05675af79a9559038c37c6aa419c9d1fe4fa8e9a12816b41304 -size 15278138 diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_AlbedoTransparency.png.meta deleted file mode 100644 index 23e3737..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_AlbedoTransparency.png.meta +++ /dev/null @@ -1,124 +0,0 @@ -fileFormatVersion: 2 -guid: 1d876fde6650ac54dbfdd2c5413a86ae -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Emission.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Emission.png deleted file mode 100644 index 4899aa6..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Emission.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e508729aea5ccd2ee71602d80581026121bf54f91120b46f21feac709e455959 -size 52939 diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Emission.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Emission.png.meta deleted file mode 100644 index 2167b07..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Emission.png.meta +++ /dev/null @@ -1,124 +0,0 @@ -fileFormatVersion: 2 -guid: 423f8ce2d10f7604f9eb19b684c812fa -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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 - 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_MetallicSmoothness.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_MetallicSmoothness.png deleted file mode 100644 index b7be79d..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_MetallicSmoothness.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0a145efe260e3cbd36683d4117e50943c5a08cf2ffe1c533b41acb113d8e625 -size 14199886 diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_MetallicSmoothness.png.meta deleted file mode 100644 index 8d17b89..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_MetallicSmoothness.png.meta +++ /dev/null @@ -1,124 +0,0 @@ -fileFormatVersion: 2 -guid: dafbef7587de8f04c9fce3450bf204fc -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Normal.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Normal.png deleted file mode 100644 index 6678c7e..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6c313efedab2ccd9c3a98405cfff953481e5186f64ad1b7138ab826f36d4e46 -size 9094708 diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Normal.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Normal.png.meta deleted file mode 100644 index 2292f0d..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Normal.png.meta +++ /dev/null @@ -1,124 +0,0 @@ -fileFormatVersion: 2 -guid: e80b7a5d5af62cf4c970b6e1f7e1b840 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - 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 - ignoreMasterTextureLimit: 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: 1 - 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Occlusion.png b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Occlusion.png deleted file mode 100644 index d5cc22d..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Occlusion.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:097afcff78a83eb34ffefc0081504b1df4ca2a5bb3a2583002174c5da9dc8568 -size 3281026 diff --git a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Occlusion.png.meta b/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Occlusion.png.meta deleted file mode 100644 index 6b0243b..0000000 --- a/Assets/Desert/Assets/Materials/Textures/Desert Portal/Desert Portal_Portal Frame_Occlusion.png.meta +++ /dev/null @@ -1,124 +0,0 @@ -fileFormatVersion: 2 -guid: a2219ef4884c9f4409fdc64f127792f2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Models/Desert Portal Exit.fbx b/Assets/Desert/Assets/Models/Desert Portal Exit.fbx deleted file mode 100644 index db5ba2e..0000000 --- a/Assets/Desert/Assets/Models/Desert Portal Exit.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5e635aac7d2bbfe2a15b80339346377881f1025aec4981fdeb91414fe2b58e2 -size 160188 diff --git a/Assets/Desert/Assets/Models/Desert Portal Exit.fbx.meta b/Assets/Desert/Assets/Models/Desert Portal Exit.fbx.meta deleted file mode 100644 index 9f99e53..0000000 --- a/Assets/Desert/Assets/Models/Desert Portal Exit.fbx.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: 1bbbd9d9b4380e3468517d7b02715af7 -ModelImporter: - serializedVersion: 22103 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 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 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Models/Desert Portal.blend b/Assets/Desert/Assets/Models/Desert Portal.blend index fa806ce..63ef160 100644 --- a/Assets/Desert/Assets/Models/Desert Portal.blend +++ b/Assets/Desert/Assets/Models/Desert Portal.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05626842fe4a0ee2b51864c4b35145484f4f8532dd05d8cdcef75bd7f48f365d -size 938872 +oid sha256:251ef4f36262e048e538bfd1b6f035e3fc3badbea7a6d09876305d03966522d5 +size 953832 diff --git a/Assets/Desert/Assets/Models/Desert Portal.blend1 b/Assets/Desert/Assets/Models/Desert Portal.blend1 index 4571583..45a601a 100644 Binary files a/Assets/Desert/Assets/Models/Desert Portal.blend1 and b/Assets/Desert/Assets/Models/Desert Portal.blend1 differ diff --git a/Assets/Desert/Assets/Models/Desert Portal Entrance.fbx b/Assets/Desert/Assets/Models/Desert Portal.fbx similarity index 100% rename from Assets/Desert/Assets/Models/Desert Portal Entrance.fbx rename to Assets/Desert/Assets/Models/Desert Portal.fbx diff --git a/Assets/Desert/Assets/Models/Desert Portal Entrance.fbx.meta b/Assets/Desert/Assets/Models/Desert Portal.fbx.meta similarity index 100% rename from Assets/Desert/Assets/Models/Desert Portal Entrance.fbx.meta rename to Assets/Desert/Assets/Models/Desert Portal.fbx.meta diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab index ff9e63a..845aade 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab @@ -25,14 +25,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2356004090473610063} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 0, y: 0, z: -0.2} - m_LocalScale: {x: -1, y: -1, z: -1} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8069972016317824103} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &752629358185251236 MeshCollider: m_ObjectHideFlags: 0 @@ -77,7 +77,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2075043192862140148} - m_Layer: 7 + m_Layer: 0 m_Name: Portal Edge m_TagString: Untagged m_Icon: {fileID: 0} @@ -91,15 +91,97 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2892577287002708294} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5, y: 0, z: -0.100000024} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0.5, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2398425302420252226} + m_Children: [] + m_Father: {fileID: 8069972016317824103} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &3282460843981856326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8260910736228715757} + - component: {fileID: 2519592802286552763} + - component: {fileID: 3543405003471994431} + m_Layer: 9 + m_Name: Surface + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8260910736228715757 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282460843981856326} + 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_ConstrainProportionsScale: 0 + m_Children: [] m_Father: {fileID: 8069972016317824103} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2519592802286552763 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282460843981856326} + m_Mesh: {fileID: -7031481941948737425, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} +--- !u!23 &3543405003471994431 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282460843981856326} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a288552730b15c74699e69df4ca2e532, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &5635962022185625128 GameObject: m_ObjectHideFlags: 0 @@ -162,7 +244,8 @@ MonoBehaviour: m_EditorClassIdentifier: size: {x: 2, y: 1} linkedPortal: {fileID: 0} - portalCamera: {fileID: 17691322601746172} + minNearClipPlane: 0.0001 + screen: {fileID: 6419237152131296747} portalTransform: {fileID: 2075043192862140148} --- !u!1 &6999744959693749346 GameObject: @@ -176,7 +259,7 @@ GameObject: - component: {fileID: 5559679283225865501} - component: {fileID: 6419237152131296747} m_Layer: 7 - m_Name: Surface + m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -189,14 +272,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6999744959693749346} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: -0, y: 0, z: -0.2} - m_LocalScale: {x: -1, y: -1, z: -1} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8069972016317824103} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5559679283225865501 MeshFilter: m_ObjectHideFlags: 0 @@ -225,7 +308,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 603cda73335499d4980d9b171eaffe0d, type: 2} + - {fileID: 2100000, guid: f6db0041cc34fe9439de56d5d92c8b8d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -256,7 +339,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8069972016317824103} - m_Layer: 7 + m_Layer: 0 m_Name: Portal m_TagString: Untagged m_Icon: {fileID: 0} @@ -270,154 +353,19 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7256878337707419357} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7774350221631063992} - {fileID: 2731753372031835923} + - {fileID: 8260910736228715757} - {fileID: 297632034835907229} - {fileID: 2075043192862140148} m_Father: {fileID: 6713443008366400661} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7398326895463990628 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2398425302420252226} - - component: {fileID: 7791795762741173939} - - component: {fileID: 5969531196797302096} - - component: {fileID: 17691322601746172} - m_Layer: 7 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2398425302420252226 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2075043192862140148} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &7791795762741173939 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 0 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 1 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &5969531196797302096 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 0 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 ---- !u!114 &17691322601746172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ad60e3973ab83f3468637a06970d7f1f, type: 3} - m_Name: - m_EditorClassIdentifier: - minNearClipPlane: 0.0001 - portal: {fileID: 3392592227672293041} - screen: {fileID: 6419237152131296747} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &8849014083961458004 GameObject: m_ObjectHideFlags: 0 @@ -427,7 +375,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6713443008366400661} - m_Layer: 7 + m_Layer: 0 m_Name: Origin m_TagString: Untagged m_Icon: {fileID: 0} @@ -462,7 +410,7 @@ GameObject: - component: {fileID: 8717415820407753879} - component: {fileID: 4905517471767474057} - component: {fileID: 153624503187559608} - m_Layer: 7 + m_Layer: 0 m_Name: Frame m_TagString: Untagged m_Icon: {fileID: 0} @@ -476,14 +424,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9139844951969793274} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: -0, y: 0, z: -0.2} - m_LocalScale: {x: -1, y: -1, z: -1} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8069972016317824103} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8717415820407753879 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab index 0f53529..fd34be6 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab @@ -25,14 +25,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506243319273626502} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 534778217790596785} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &884126343611003350 MeshCollider: m_ObjectHideFlags: 0 @@ -79,13 +79,13 @@ GameObject: - component: {fileID: 7833101140158502987} - component: {fileID: 2716330164156348363} - component: {fileID: 3566871879873967933} - m_Layer: 7 + m_Layer: 0 m_Name: Surface m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &7833101140158502987 Transform: m_ObjectHideFlags: 0 @@ -93,14 +93,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698537097821251252} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 534778217790596785} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2716330164156348363 MeshFilter: m_ObjectHideFlags: 0 @@ -129,7 +129,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 603cda73335499d4980d9b171eaffe0d, type: 2} + - {fileID: 2100000, guid: a288552730b15c74699e69df4ca2e532, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -160,7 +160,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 534778217790596785} - m_Layer: 7 + m_Layer: 0 m_Name: Portal m_TagString: Untagged m_Icon: {fileID: 0} @@ -174,7 +174,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873761378697362443} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -182,10 +182,11 @@ Transform: - {fileID: 8079730491061412845} - {fileID: 5583485013713733061} - {fileID: 7833101140158502987} + - {fileID: 5827649297122452190} - {fileID: 2075043192862140148} m_Father: {fileID: 6713443008366400661} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &1604096967460232748 GameObject: m_ObjectHideFlags: 0 @@ -198,7 +199,7 @@ GameObject: - component: {fileID: 1184410134851835457} - component: {fileID: 3208325555222820191} - component: {fileID: 8986701432981899850} - m_Layer: 7 + m_Layer: 0 m_Name: Frame m_TagString: Untagged m_Icon: {fileID: 0} @@ -212,14 +213,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604096967460232748} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 534778217790596785} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1184410134851835457 MeshFilter: m_ObjectHideFlags: 0 @@ -248,7 +249,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 82a34b0bedfa9b34fa84ff334b453298, type: 2} + - {fileID: 2100000, guid: f8e1f11710a5e6d439d170b75393d0f2, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -301,7 +302,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2075043192862140148} - m_Layer: 7 + m_Layer: 0 m_Name: Portal Edge m_TagString: Untagged m_Icon: {fileID: 0} @@ -315,15 +316,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2892577287002708294} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: -0.5, y: 0, z: -0.1} + m_LocalRotation: {x: 0.00000026341777, y: -0.7071068, z: -0.7071068, w: 0.00000026341777} + m_LocalPosition: {x: -0.5, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2398425302420252226} + m_Children: [] m_Father: {fileID: 534778217790596785} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} --- !u!1 &5635962022185625128 GameObject: m_ObjectHideFlags: 0 @@ -386,9 +386,10 @@ MonoBehaviour: m_EditorClassIdentifier: size: {x: 2, y: 1} linkedPortal: {fileID: 0} - portalCamera: {fileID: 17691322601746172} + minNearClipPlane: 0.0001 + screen: {fileID: 4213373133551198729} portalTransform: {fileID: 2075043192862140148} ---- !u!1 &7398326895463990628 +--- !u!1 &7834511528252864296 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -396,134 +397,81 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2398425302420252226} - - component: {fileID: 7791795762741173939} - - component: {fileID: 5969531196797302096} - - component: {fileID: 17691322601746172} - m_Layer: 7 - m_Name: Camera + - component: {fileID: 5827649297122452190} + - component: {fileID: 8369793365696928931} + - component: {fileID: 4213373133551198729} + m_Layer: 0 + m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2398425302420252226 + m_IsActive: 0 +--- !u!4 &5827649297122452190 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} + m_GameObject: {fileID: 7834511528252864296} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2075043192862140148} + m_Father: {fileID: 534778217790596785} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &7791795762741173939 -Camera: +--- !u!33 &8369793365696928931 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 0 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 1 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &5969531196797302096 -MonoBehaviour: + m_GameObject: {fileID: 7834511528252864296} + m_Mesh: {fileID: -6535995738390492784, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} +--- !u!23 &4213373133551198729 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} + m_GameObject: {fileID: 7834511528252864296} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 0 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 ---- !u!114 &17691322601746172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ad60e3973ab83f3468637a06970d7f1f, type: 3} - m_Name: - m_EditorClassIdentifier: - minNearClipPlane: 0.0001 - portal: {fileID: 3171802695548060926} - screen: {fileID: 3566871879873967933} + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f6db0041cc34fe9439de56d5d92c8b8d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8849014083961458004 GameObject: m_ObjectHideFlags: 0 @@ -533,7 +481,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6713443008366400661} - m_Layer: 7 + m_Layer: 0 m_Name: Origin m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Portal/Assets/Materials/Portal Surface.shadergraph b/Assets/Portal/Assets/Materials/Portal Surface.shadergraph index d2d941b..5af1c29 100644 --- a/Assets/Portal/Assets/Materials/Portal Surface.shadergraph +++ b/Assets/Portal/Assets/Materials/Portal Surface.shadergraph @@ -101,6 +101,21 @@ }, { "m_Id": "ab4f096d432e4284b3b61af7b01c22a3" + }, + { + "m_Id": "d57a1dd5a93a4e4299bbe9136e36a6bb" + }, + { + "m_Id": "edc68d0250824bf08079b4af96da0203" + }, + { + "m_Id": "25d7134bd197436cbede52e56fecfa30" + }, + { + "m_Id": "7184019e441f4b46a3b0775ec97fbdef" + }, + { + "m_Id": "2e73d4fd94344f548926265cc54924da" } ], "m_GroupDatas": [], @@ -134,6 +149,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "25d7134bd197436cbede52e56fecfa30" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "292bc4ac8b814f618224fe3b78c94bd1" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -162,6 +191,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2e73d4fd94344f548926265cc54924da" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "edc68d0250824bf08079b4af96da0203" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -229,6 +272,20 @@ "m_Node": { "m_Id": "e7506776be2344c48722eb5262a10de7" }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7184019e441f4b46a3b0775ec97fbdef" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d57a1dd5a93a4e4299bbe9136e36a6bb" + }, "m_SlotId": 0 } }, @@ -358,6 +415,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d57a1dd5a93a4e4299bbe9136e36a6bb" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2e73d4fd94344f548926265cc54924da" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d57a1dd5a93a4e4299bbe9136e36a6bb" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25d7134bd197436cbede52e56fecfa30" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -414,6 +499,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "edc68d0250824bf08079b4af96da0203" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25d7134bd197436cbede52e56fecfa30" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -425,7 +524,7 @@ "m_Node": { "m_Id": "e7506776be2344c48722eb5262a10de7" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -543,6 +642,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "03cca12163854f9788c01d21180b7dd4", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -606,6 +753,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "099e23bad35a47a097651ab977575625", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2Node", @@ -618,10 +780,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2073.0, - "y": 588.0, - "width": 127.9998779296875, - "height": 100.99993896484375 + "x": -2349.0, + "y": 701.9999389648438, + "width": 128.0, + "height": 101.0 } }, "m_Slots": [ @@ -942,8 +1104,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1976.0, - "y": -319.0000305175781, + "x": -2445.0, + "y": 17.999998092651368, "width": 208.0, "height": 350.0 } @@ -999,6 +1161,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2Node", + "m_ObjectId": "25d7134bd197436cbede52e56fecfa30", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Vector 2", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3069.0, + "y": -62.999996185302737, + "width": 128.0, + "height": 101.00001525878906 + } + }, + "m_Slots": [ + { + "m_Id": "b484077442cf468ea7431d9efcc969da" + }, + { + "m_Id": "426ea2c5075d47188fbcccf8d8906abd" + }, + { + "m_Id": "cf7bee7377004b5d8204a01571b1f6cf" + } + ], + "synonyms": [ + "2", + "v2", + "vec2", + "float2" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": { + "x": 0.0, + "y": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1035,10 +1245,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2330.0, - "y": -319.0000305175781, - "width": 208.0, - "height": 361.0 + "x": -2798.999755859375, + "y": 17.999998092651368, + "width": 207.999755859375, + "height": 360.9999694824219 } }, "m_Slots": [ @@ -1076,7 +1286,7 @@ "m_Hidden": false, "m_ShaderOutputName": "CellDensity", "m_StageCapability": 3, - "m_Value": 5.0, + "m_Value": 10.0, "m_DefaultValue": 5.0, "m_Labels": [] } @@ -1130,10 +1340,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1900.0, - "y": 588.0, - "width": 208.0, - "height": 277.99993896484377 + "x": -2201.0, + "y": 701.9999389648438, + "width": 207.9998779296875, + "height": 278.0 } }, "m_Slots": [ @@ -1156,6 +1366,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "2e73d4fd94344f548926265cc54924da", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3454.0, + "y": -62.999996185302737, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "9901e2f9e6fb403dadc82efb6768effb" + }, + { + "m_Id": "c0cdddaffb894fb08a1551a55b5afbed" + }, + { + "m_Id": "8087a53478d14fb88192a17e1b64313c" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -1233,10 +1486,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1081.0001220703125, - "y": 525.0, - "width": 174.00018310546876, - "height": 34.0 + "x": -1055.0, + "y": 390.9999694824219, + "width": 174.0, + "height": 34.000030517578128 } }, "m_Slots": [ @@ -1380,6 +1633,44 @@ "m_Channel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "426ea2c5075d47188fbcccf8d8906abd", + "m_Id": 2, + "m_DisplayName": "Y", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Y", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "Y" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "4d38b4d65622458c8e203fbfe0bf8850", + "m_Id": 1, + "m_DisplayName": "Center", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Center", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5, + "y": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1437,10 +1728,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2629.0, - "y": 130.99996948242188, - "width": 208.0, - "height": 301.9999694824219 + "x": -3068.999755859375, + "y": 333.9999084472656, + "width": 125.999755859375, + "height": 118.00003051757813 } }, "m_Slots": [ @@ -1460,7 +1751,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1607,6 +1898,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "689ab72b7dc349ddae8d85ff75398021", + "m_Id": 2, + "m_DisplayName": "Rotation", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Rotation", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1661,10 +1967,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2854.0, - "y": 11.9999418258667, - "width": 123.999755859375, - "height": 173.00003051757813 + "x": -3216.0, + "y": 200.9999237060547, + "width": 124.000244140625, + "height": 173.00001525878907 } }, "m_Slots": [ @@ -1743,6 +2049,97 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "7162157436b14001b1027b9d0f80d45c", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.5, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RotateNode", + "m_ObjectId": "7184019e441f4b46a3b0775ec97fbdef", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Rotate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3899.0, + "y": -62.999996185302737, + "width": 208.0, + "height": 360.9999694824219 + } + }, + "m_Slots": [ + { + "m_Id": "a3c96dfe35e04ecdac252effb53f3381" + }, + { + "m_Id": "4d38b4d65622458c8e203fbfe0bf8850" + }, + { + "m_Id": "689ab72b7dc349ddae8d85ff75398021" + }, + { + "m_Id": "87918ef4706a4871a6194ce37a709eb9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Unit": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1823,10 +2220,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2822.000244140625, - "y": 195.00003051757813, - "width": 163.000244140625, - "height": 33.99989318847656 + "x": -3254.999755859375, + "y": 399.0, + "width": 163.0, + "height": 33.999969482421878 } }, "m_Slots": [ @@ -1865,6 +2262,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8087a53478d14fb88192a17e1b64313c", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2036,10 +2457,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1115.0, - "y": 195.00003051757813, - "width": 208.00006103515626, - "height": 301.9999694824219 + "x": -1413.0, + "y": 317.9999084472656, + "width": 207.9998779296875, + "height": 302.0000305175781 } }, "m_Slots": [ @@ -2067,6 +2488,27 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "87918ef4706a4871a6194ce37a709eb9", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -2194,6 +2636,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9901e2f9e6fb403dadc82efb6768effb", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.VoronoiNode", @@ -2206,10 +2672,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1733.0, - "y": -31.00004005432129, - "width": 208.0, - "height": 361.00006103515627 + "x": -2202.0, + "y": 306.0000305175781, + "width": 208.0001220703125, + "height": 360.9999084472656 } }, "m_Slots": [ @@ -2278,8 +2744,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2491.0, - "y": 588.0, + "x": -2711.0, + "y": 701.9999389648438, "width": 208.0, "height": 325.99993896484377 } @@ -2351,6 +2817,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "a160bda635d44d0a9398feb0044fb0d8", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2366,6 +2880,28 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "a3c96dfe35e04ecdac252effb53f3381", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", @@ -2378,9 +2914,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1386.0001220703125, - "y": 464.0, - "width": 208.0, + "x": -1646.0, + "y": 701.9999389648438, + "width": 207.9998779296875, "height": 278.0 } }, @@ -2430,6 +2966,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a8c53337c12d4fd9985486cd8494da18", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -2464,6 +3015,30 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "adc7b700b845482abf8f4a6f265b42a6", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2491,8 +3066,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1628.0001220703125, - "y": 464.0, + "x": -1888.0, + "y": 701.9999389648438, "width": 208.0, "height": 325.99993896484377 } @@ -2538,6 +3113,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b484077442cf468ea7431d9efcc969da", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2583,6 +3173,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bb2fcd36d3de4d108e8c3d2238f44edd", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2634,10 +3239,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1386.0001220703125, - "y": -31.00004005432129, - "width": 208.0, - "height": 325.99993896484377 + "x": -1646.0, + "y": 317.9999084472656, + "width": 207.9998779296875, + "height": 326.0000305175781 } }, "m_Slots": [ @@ -2664,6 +3269,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "c0cdddaffb894fb08a1551a55b5afbed", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -2822,6 +3451,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ce39e821eb484e29807f0817b889ca84", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2837,6 +3481,27 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "cf7bee7377004b5d8204a01571b1f6cf", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2873,6 +3538,53 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "d57a1dd5a93a4e4299bbe9136e36a6bb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3666.0, + "y": -62.999996185302737, + "width": 119.0, + "height": 148.99998474121095 + } + }, + "m_Slots": [ + { + "m_Id": "adc7b700b845482abf8f4a6f265b42a6" + }, + { + "m_Id": "ce39e821eb484e29807f0817b889ca84" + }, + { + "m_Id": "099e23bad35a47a097651ab977575625" + }, + { + "m_Id": "a8c53337c12d4fd9985486cd8494da18" + }, + { + "m_Id": "bb2fcd36d3de4d108e8c3d2238f44edd" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3001,10 +3713,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2225.0, - "y": 588.0, - "width": 120.0, - "height": 148.99993896484376 + "x": -2482.999755859375, + "y": 701.9999389648438, + "width": 119.999755859375, + "height": 149.0 } }, "m_Slots": [ @@ -3092,10 +3804,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2629.0, - "y": -204.0000762939453, - "width": 208.0, - "height": 302.0 + "x": -3068.999755859375, + "y": 67.0, + "width": 125.999755859375, + "height": 118.00003051757813 } }, "m_Slots": [ @@ -3115,7 +3827,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -3184,8 +3896,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2836.0, - "y": 588.0, + "x": -3056.0, + "y": 701.9999389648438, "width": 208.0, "height": 313.0 } @@ -3236,6 +3948,49 @@ "m_ScreenSpaceType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "edc68d0250824bf08079b4af96da0203", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -3235.000244140625, + "y": -62.999996185302737, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "a160bda635d44d0a9398feb0044fb0d8" + }, + { + "m_Id": "7162157436b14001b1027b9d0f80d45c" + }, + { + "m_Id": "03cca12163854f9788c01d21180b7dd4" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -3296,10 +4051,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2854.0, - "y": -139.0000457763672, + "x": -3246.999755859375, + "y": 106.0, "width": 155.0, - "height": 34.000022888183597 + "height": 33.999969482421878 } }, "m_Slots": [ diff --git a/Assets/Portal/Runtime/Portal.cs b/Assets/Portal/Runtime/Portal.cs index 8b5715a..04b71d9 100644 --- a/Assets/Portal/Runtime/Portal.cs +++ b/Assets/Portal/Runtime/Portal.cs @@ -92,7 +92,7 @@ namespace EscapeRoomEngine.Portal.Runtime { // place camera Matrix4x4 cameraTransform; - if (monoOrEye == Camera.MonoOrStereoscopicEye.Mono) + if (monoOrEye == Camera.MonoOrStereoscopicEye.Mono || playerCamera != Player.Instance.camera) { cameraTransform = portalTransform.localToWorldMatrix * HalfRotation * linkedPortal.portalTransform.worldToLocalMatrix * @@ -100,7 +100,6 @@ namespace EscapeRoomEngine.Portal.Runtime } else { - // stereoRenderCounter = (stereoRenderCounter + 1) % 2; var eye = monoOrEye == Camera.MonoOrStereoscopicEye.Left ? Camera.StereoscopicEye.Left : Camera.StereoscopicEye.Right;