diff --git a/Assets/_Project.meta b/Assets/Examples.meta similarity index 77% rename from Assets/_Project.meta rename to Assets/Examples.meta index 61dacf9..406ca99 100644 --- a/Assets/_Project.meta +++ b/Assets/Examples.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d4ac037e25a507d478617d859365a65e +guid: c0a0c7146149b214abdd5727c1b2707f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Project/Gallery.meta b/Assets/Examples/ImageSlideshow.meta similarity index 77% rename from Assets/_Project/Gallery.meta rename to Assets/Examples/ImageSlideshow.meta index 9a8ec60..c3a6b1b 100644 --- a/Assets/_Project/Gallery.meta +++ b/Assets/Examples/ImageSlideshow.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60092339c06d8f649a0bc7bd630db3e1 +guid: f195b55cd4083264a9ca370dfc18cc56 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Project/Frame.meta b/Assets/Examples/ImageSlideshow/Frame.meta similarity index 100% rename from Assets/_Project/Frame.meta rename to Assets/Examples/ImageSlideshow/Frame.meta diff --git a/Assets/_Project/Frame/PictureMaterial.mat b/Assets/Examples/ImageSlideshow/Frame/PictureMaterial.mat similarity index 100% rename from Assets/_Project/Frame/PictureMaterial.mat rename to Assets/Examples/ImageSlideshow/Frame/PictureMaterial.mat diff --git a/Assets/_Project/Frame/PictureMaterial.mat.meta b/Assets/Examples/ImageSlideshow/Frame/PictureMaterial.mat.meta similarity index 100% rename from Assets/_Project/Frame/PictureMaterial.mat.meta rename to Assets/Examples/ImageSlideshow/Frame/PictureMaterial.mat.meta diff --git a/Assets/_Project/Frame/SlideshowFrame.asset b/Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.asset similarity index 100% rename from Assets/_Project/Frame/SlideshowFrame.asset rename to Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.asset diff --git a/Assets/_Project/Frame/SlideshowFrame.asset.meta b/Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.asset.meta similarity index 100% rename from Assets/_Project/Frame/SlideshowFrame.asset.meta rename to Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.asset.meta diff --git a/Assets/_Project/Frame/SlideshowFrame.cs b/Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.cs similarity index 100% rename from Assets/_Project/Frame/SlideshowFrame.cs rename to Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.cs diff --git a/Assets/_Project/Frame/SlideshowFrame.cs.meta b/Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.cs.meta similarity index 100% rename from Assets/_Project/Frame/SlideshowFrame.cs.meta rename to Assets/Examples/ImageSlideshow/Frame/SlideshowFrame.cs.meta diff --git a/Assets/_Project/Frame/SquareFrame.meta b/Assets/Examples/ImageSlideshow/Frame/SquareFrame.meta similarity index 100% rename from Assets/_Project/Frame/SquareFrame.meta rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame.meta diff --git a/Assets/_Project/Frame/SquareFrame/ImageFrame.mat b/Assets/Examples/ImageSlideshow/Frame/SquareFrame/ImageFrame.mat similarity index 100% rename from Assets/_Project/Frame/SquareFrame/ImageFrame.mat rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame/ImageFrame.mat diff --git a/Assets/_Project/Frame/SquareFrame/ImageFrame.mat.meta b/Assets/Examples/ImageSlideshow/Frame/SquareFrame/ImageFrame.mat.meta similarity index 100% rename from Assets/_Project/Frame/SquareFrame/ImageFrame.mat.meta rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame/ImageFrame.mat.meta diff --git a/Assets/_Project/Frame/SquareFrame/squareFrame.asset b/Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.asset similarity index 100% rename from Assets/_Project/Frame/SquareFrame/squareFrame.asset rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.asset diff --git a/Assets/_Project/Frame/SquareFrame/squareFrame.asset.meta b/Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.asset.meta similarity index 100% rename from Assets/_Project/Frame/SquareFrame/squareFrame.asset.meta rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.asset.meta diff --git a/Assets/_Project/Frame/SquareFrame/squareFrame.prefab b/Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.prefab similarity index 100% rename from Assets/_Project/Frame/SquareFrame/squareFrame.prefab rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.prefab diff --git a/Assets/_Project/Frame/SquareFrame/squareFrame.prefab.meta b/Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.prefab.meta similarity index 100% rename from Assets/_Project/Frame/SquareFrame/squareFrame.prefab.meta rename to Assets/Examples/ImageSlideshow/Frame/SquareFrame/squareFrame.prefab.meta diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow.meta new file mode 100644 index 0000000..d1b7230 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8724046cde198bd4b88edeb0688566d9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow.unity b/Assets/Examples/ImageSlideshow/ImageSlideshow.unity new file mode 100644 index 0000000..10a1dab --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc0e2579ac2bd526f511699502860629c6159c74ae4a83f502a660b2fa78b553 +size 41356 diff --git a/Assets/_Project/Gallery.unity.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow.unity.meta similarity index 100% rename from Assets/_Project/Gallery.unity.meta rename to Assets/Examples/ImageSlideshow/ImageSlideshow.unity.meta diff --git a/Assets/_Project/Gallery/LightingData.asset b/Assets/Examples/ImageSlideshow/ImageSlideshow/LightingData.asset similarity index 90% rename from Assets/_Project/Gallery/LightingData.asset rename to Assets/Examples/ImageSlideshow/ImageSlideshow/LightingData.asset index d84cc5a..f18bf08 100644 Binary files a/Assets/_Project/Gallery/LightingData.asset and b/Assets/Examples/ImageSlideshow/ImageSlideshow/LightingData.asset differ diff --git a/Assets/_Project/Gallery/LightingData.asset.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/LightingData.asset.meta similarity index 79% rename from Assets/_Project/Gallery/LightingData.asset.meta rename to Assets/Examples/ImageSlideshow/ImageSlideshow/LightingData.asset.meta index 5c679b2..a55bcdf 100644 --- a/Assets/_Project/Gallery/LightingData.asset.meta +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/LightingData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f754619c488bb146bb60000ad9ee9fb +guid: 1491f6bfe32cdba4ca586b2b1949dff0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 112000000 diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_dir.png b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..c01b95c --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:493c40f62d155a14955ee107c1d2ba83523ab505a63980a814400f408fc7cd4e +size 200482 diff --git a/Assets/_Project/Gallery/Lightmap-0_comp_dir.png.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_dir.png.meta similarity index 98% rename from Assets/_Project/Gallery/Lightmap-0_comp_dir.png.meta rename to Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_dir.png.meta index b963940..924e89c 100644 --- a/Assets/_Project/Gallery/Lightmap-0_comp_dir.png.meta +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_dir.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6200dc697f75b534a82185d6743c1e5f +guid: 854ae66a83deee44487201b8a459a06f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_light.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..33a30cd Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_light.exr differ diff --git a/Assets/_Project/Gallery/Lightmap-0_comp_light.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_light.exr.meta similarity index 98% rename from Assets/_Project/Gallery/Lightmap-0_comp_light.exr.meta rename to Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_light.exr.meta index 8a12c88..8599837 100644 --- a/Assets/_Project/Gallery/Lightmap-0_comp_light.exr.meta +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-0_comp_light.exr.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26a8f17f59f5d874c8fa782942592273 +guid: 2609451cbc2e05b4ca9fd8ea7ac7bb5c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_dir.png b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_dir.png new file mode 100644 index 0000000..11c44af --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:339271221ed3b18b85f7b9231f8647b45a9d168448dba0e100ac4be854927e3d +size 159690 diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_dir.png.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_dir.png.meta new file mode 100644 index 0000000..8b2432f --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_dir.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 29f942cad27b9b7439140cb060eb86cf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 12 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_light.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_light.exr new file mode 100644 index 0000000..aa42bee Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_light.exr differ diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_light.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_light.exr.meta new file mode 100644 index 0000000..7262a76 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-1_comp_light.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4ba4e793f8a96c148afffc8aa9e1eeb2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_dir.png b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_dir.png new file mode 100644 index 0000000..1911ccc --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bf6f1074d73bef365ae42122311a7dd761e994f6cb8b285de4b024f00408478 +size 186003 diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_dir.png.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_dir.png.meta new file mode 100644 index 0000000..f299677 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_dir.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 21538d072296a7f489475101da837a56 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 12 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_light.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_light.exr new file mode 100644 index 0000000..34cb1b9 Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_light.exr differ diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_light.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_light.exr.meta new file mode 100644 index 0000000..9aaa094 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-2_comp_light.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1cad8f0e0f201964d9e0e8bfe121f713 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_dir.png b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_dir.png new file mode 100644 index 0000000..0112134 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2a51b4e80b50bfeeab03dfa0ef79705d252da67835c206d33378325ea16fd27 +size 168328 diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_dir.png.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_dir.png.meta new file mode 100644 index 0000000..564d2eb --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_dir.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 048df7dcf7fafdb4cbd07fecb0ded68d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 12 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_light.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_light.exr new file mode 100644 index 0000000..f1298e6 Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_light.exr differ diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_light.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_light.exr.meta new file mode 100644 index 0000000..6eee24d --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-3_comp_light.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 21e86bc1072b90b4a887c1c5e81fe2fe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_dir.png b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_dir.png new file mode 100644 index 0000000..5263bee --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcfa64872cac88be8df18d60652df06fcb48041a1ffbb232c481c54b085e7430 +size 198432 diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_dir.png.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_dir.png.meta new file mode 100644 index 0000000..875c363 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_dir.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b53404185c96f384cbcb6aed9a3fc69d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 12 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_light.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_light.exr new file mode 100644 index 0000000..e8dd9f7 Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_light.exr differ diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_light.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_light.exr.meta new file mode 100644 index 0000000..6f5b170 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-4_comp_light.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6faced2a8ce0cfa4ca5474e7fe3b65b0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_dir.png b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_dir.png new file mode 100644 index 0000000..0a135d4 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6386f1d4b270fad0a82db92c2510543c373573f4ba131fe14a11727bcaa6ab8 +size 12346 diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_dir.png.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_dir.png.meta new file mode 100644 index 0000000..af952d3 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_dir.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f4618008d4a2a5e4c82ddcac05f78862 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 12 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_light.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_light.exr new file mode 100644 index 0000000..aad8d4d Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_light.exr differ diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_light.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_light.exr.meta new file mode 100644 index 0000000..8e8f432 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/Lightmap-5_comp_light.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4ac0a90969e071446b1757d8b4a5055d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/ImageSlideshow/ImageSlideshow/ReflectionProbe-0.exr b/Assets/Examples/ImageSlideshow/ImageSlideshow/ReflectionProbe-0.exr new file mode 100644 index 0000000..af47207 Binary files /dev/null and b/Assets/Examples/ImageSlideshow/ImageSlideshow/ReflectionProbe-0.exr differ diff --git a/Assets/_Project/Gallery/ReflectionProbe-0.exr.meta b/Assets/Examples/ImageSlideshow/ImageSlideshow/ReflectionProbe-0.exr.meta similarity index 98% rename from Assets/_Project/Gallery/ReflectionProbe-0.exr.meta rename to Assets/Examples/ImageSlideshow/ImageSlideshow/ReflectionProbe-0.exr.meta index dac4941..cf1611b 100644 --- a/Assets/_Project/Gallery/ReflectionProbe-0.exr.meta +++ b/Assets/Examples/ImageSlideshow/ImageSlideshow/ReflectionProbe-0.exr.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8a8272c6aa139f40bcc659c08e0340f +guid: 2aae5ef108084104a8adbf817490fab9 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/_Project/Materials.meta b/Assets/Examples/ImageSlideshow/Materials.meta similarity index 100% rename from Assets/_Project/Materials.meta rename to Assets/Examples/ImageSlideshow/Materials.meta diff --git a/Assets/_Project/Materials/vrchat-community.mat b/Assets/Examples/ImageSlideshow/Materials/FramePicture.mat similarity index 96% rename from Assets/_Project/Materials/vrchat-community.mat rename to Assets/Examples/ImageSlideshow/Materials/FramePicture.mat index a3ac506..7907b6f 100644 --- a/Assets/_Project/Materials/vrchat-community.mat +++ b/Assets/Examples/ImageSlideshow/Materials/FramePicture.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: vrchat-community + m_Name: FramePicture m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/_Project/Materials/vrchat-community.mat.meta b/Assets/Examples/ImageSlideshow/Materials/FramePicture.mat.meta similarity index 100% rename from Assets/_Project/Materials/vrchat-community.mat.meta rename to Assets/Examples/ImageSlideshow/Materials/FramePicture.mat.meta diff --git a/Assets/_Project/Materials/GalleryFloor.mat b/Assets/Examples/ImageSlideshow/Materials/GalleryFloor.mat similarity index 100% rename from Assets/_Project/Materials/GalleryFloor.mat rename to Assets/Examples/ImageSlideshow/Materials/GalleryFloor.mat diff --git a/Assets/_Project/Materials/GalleryFloor.mat.meta b/Assets/Examples/ImageSlideshow/Materials/GalleryFloor.mat.meta similarity index 100% rename from Assets/_Project/Materials/GalleryFloor.mat.meta rename to Assets/Examples/ImageSlideshow/Materials/GalleryFloor.mat.meta diff --git a/Assets/_Project/Materials/GallerySky.mat b/Assets/Examples/ImageSlideshow/Materials/GallerySky.mat similarity index 100% rename from Assets/_Project/Materials/GallerySky.mat rename to Assets/Examples/ImageSlideshow/Materials/GallerySky.mat diff --git a/Assets/_Project/Materials/GallerySky.mat.meta b/Assets/Examples/ImageSlideshow/Materials/GallerySky.mat.meta similarity index 100% rename from Assets/_Project/Materials/GallerySky.mat.meta rename to Assets/Examples/ImageSlideshow/Materials/GallerySky.mat.meta diff --git a/Assets/_Project/Materials/RoomMaterial.mat b/Assets/Examples/ImageSlideshow/Materials/RoomMaterial.mat similarity index 100% rename from Assets/_Project/Materials/RoomMaterial.mat rename to Assets/Examples/ImageSlideshow/Materials/RoomMaterial.mat diff --git a/Assets/_Project/Materials/RoomMaterial.mat.meta b/Assets/Examples/ImageSlideshow/Materials/RoomMaterial.mat.meta similarity index 100% rename from Assets/_Project/Materials/RoomMaterial.mat.meta rename to Assets/Examples/ImageSlideshow/Materials/RoomMaterial.mat.meta diff --git a/Assets/_Project/Materials/vrchat-community.png b/Assets/Examples/ImageSlideshow/Materials/vrchat-community.png similarity index 100% rename from Assets/_Project/Materials/vrchat-community.png rename to Assets/Examples/ImageSlideshow/Materials/vrchat-community.png diff --git a/Assets/_Project/Materials/vrchat-community.png.meta b/Assets/Examples/ImageSlideshow/Materials/vrchat-community.png.meta similarity index 100% rename from Assets/_Project/Materials/vrchat-community.png.meta rename to Assets/Examples/ImageSlideshow/Materials/vrchat-community.png.meta diff --git a/Assets/Examples/ImageSlideshow/SlideshowFrame.prefab b/Assets/Examples/ImageSlideshow/SlideshowFrame.prefab new file mode 100644 index 0000000..2bf3a03 --- /dev/null +++ b/Assets/Examples/ImageSlideshow/SlideshowFrame.prefab @@ -0,0 +1,436 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &929995823494158555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 929995823494158554} + - component: {fileID: 929995823494158500} + - component: {fileID: 929995823494158501} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &929995823494158554 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929995823494158555} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0020008} + m_LocalScale: {x: 2.0303, y: 2.0303, z: 2.0303} + m_Children: [] + m_Father: {fileID: 8564481254345429613} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &929995823494158500 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929995823494158555} + m_Mesh: {fileID: 4300000, guid: 7385ff696a0f0944085ef57fcbacc0b6, type: 2} +--- !u!23 &929995823494158501 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929995823494158555} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: bb3917d0ae74ca14f8297301395f9275, 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: 2 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &1666915793605624023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1666915793605624040} + - component: {fileID: 1666915793605624041} + - component: {fileID: 1666915793605624022} + m_Layer: 0 + m_Name: Picture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1666915793605624040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666915793605624023} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.24569} + m_LocalScale: {x: 1.21818, y: 1.21818, z: 1.21818} + m_Children: [] + m_Father: {fileID: 8564481254345429613} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1666915793605624041 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666915793605624023} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1666915793605624022 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666915793605624023} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 90a21debcf76965499131bd63823a420, 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 +--- !u!1 &4822871787309189753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8564481254345429613} + - component: {fileID: 4822871787309189755} + - component: {fileID: 4822871787309189752} + m_Layer: 0 + m_Name: TheFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8564481254345429613 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4822871787309189753} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 929995823494158554} + - {fileID: 1666915793605624040} + - {fileID: 2644362360117245124} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4822871787309189755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4822871787309189753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2288da0e6c68e3243b40ad011ff6715a, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 4822871787309189752} + imageUrls: + - url: https://vrchat-community.github.io/examples-image-loading/1.jpg + - url: https://vrchat-community.github.io/examples-image-loading/2.jpg + - url: https://vrchat-community.github.io/examples-image-loading/3.jpg + - url: https://vrchat-community.github.io/examples-image-loading/4.jpg + - url: https://vrchat-community.github.io/examples-image-loading/5.jpg + - url: https://vrchat-community.github.io/examples-image-loading/6.jpg + - url: https://vrchat-community.github.io/examples-image-loading/7.jpg + - url: https://vrchat-community.github.io/examples-image-loading/8.jpg + - url: https://vrchat-community.github.io/examples-image-loading/9.jpg + - url: https://vrchat-community.github.io/examples-image-loading/10.jpg + stringUrl: + url: https://vrchat-community.github.io/examples-image-loading/captions.csv + renderer: {fileID: 1666915793605624022} + field: {fileID: 4695441022309825067} + slideDurationSeconds: 5 +--- !u!114 &4822871787309189752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4822871787309189753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 1 + serializedProgramAsset: {fileID: 11400000, guid: 2945372477ec6354d804691fd1e55d70, + type: 2} + programSource: {fileID: 11400000, guid: d904c1df903da8441a75d31379aab386, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &5141401321457294960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2644362360117245124} + - component: {fileID: 6287180064142113093} + - component: {fileID: 2890290999140452668} + - component: {fileID: 9041647289019580416} + m_Layer: 5 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2644362360117245124 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5141401321457294960} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.28224} + m_LocalScale: {x: 0.0024769658, y: 0.0024769658, z: 0.0024769658} + m_Children: + - {fileID: 651681214825560020} + m_Father: {fileID: 8564481254345429613} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.014212} + m_SizeDelta: {x: 512, y: 512} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &6287180064142113093 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5141401321457294960} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2890290999140452668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5141401321457294960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 2 +--- !u!114 &9041647289019580416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5141401321457294960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &8490851998330591042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 651681214825560020} + - component: {fileID: 7979224173058605752} + - component: {fileID: 4695441022309825067} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &651681214825560020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8490851998330591042} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000012031786} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2644362360117245124} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: 27} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &7979224173058605752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8490851998330591042} + m_CullTransparentMesh: 0 +--- !u!114 &4695441022309825067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8490851998330591042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Loading... diff --git a/Assets/Examples/ImageSlideshow/SlideshowFrame.prefab.meta b/Assets/Examples/ImageSlideshow/SlideshowFrame.prefab.meta new file mode 100644 index 0000000..3c1a2ff --- /dev/null +++ b/Assets/Examples/ImageSlideshow/SlideshowFrame.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 90a0d5dc4e8c84642a0650e9c0d85806 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro.meta b/Assets/TextMesh Pro.meta new file mode 100644 index 0000000..f9da8b5 --- /dev/null +++ b/Assets/TextMesh Pro.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f54d1bd14bd3ca042bd867b519fee8cc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Documentation.meta b/Assets/TextMesh Pro/Documentation.meta new file mode 100644 index 0000000..afa527a --- /dev/null +++ b/Assets/TextMesh Pro/Documentation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e7e8f5a82a3a134e91c54efd2274ea9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Fonts.meta b/Assets/TextMesh Pro/Fonts.meta new file mode 100644 index 0000000..f0c2972 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ab70aee4d56447429c680537fbf93ed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources.meta b/Assets/TextMesh Pro/Resources.meta new file mode 100644 index 0000000..cfc142f --- /dev/null +++ b/Assets/TextMesh Pro/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 243e06394e614e5d99fab26083b707fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials.meta new file mode 100644 index 0000000..55df787 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 731f1baa9d144a9897cb1d341c2092b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets.meta b/Assets/TextMesh Pro/Resources/Sprite Assets.meta new file mode 100644 index 0000000..96b87a7 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Sprite Assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 512a49d95c0c4332bdd98131869c23c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Style Sheets.meta b/Assets/TextMesh Pro/Resources/Style Sheets.meta new file mode 100644 index 0000000..48d9ef8 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Style Sheets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4aecb92fff08436c8303b10eab8da368 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Shaders.meta b/Assets/TextMesh Pro/Shaders.meta new file mode 100644 index 0000000..29a90a6 --- /dev/null +++ b/Assets/TextMesh Pro/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9f693669af91aa45ad615fc681ed29f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Sprites.meta b/Assets/TextMesh Pro/Sprites.meta new file mode 100644 index 0000000..8b699e5 --- /dev/null +++ b/Assets/TextMesh Pro/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0603b6d5186471b96c778c3949c7ce2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Gallery.unity b/Assets/_Project/Gallery.unity deleted file mode 100644 index ce2931b..0000000 --- a/Assets/_Project/Gallery.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f849d228b2f1cfe10e29444a5b0a3c48866e375b65369781b6a627d11bdceb9 -size 52732 diff --git a/Assets/_Project/Gallery/Lightmap-0_comp_dir.png b/Assets/_Project/Gallery/Lightmap-0_comp_dir.png deleted file mode 100644 index d824be9..0000000 --- a/Assets/_Project/Gallery/Lightmap-0_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:807b7d848e17ab6fb16885a8e8f0ba1390dbb3dca4b7323d9f3e603677b5643a -size 141355 diff --git a/Assets/_Project/Gallery/Lightmap-0_comp_light.exr b/Assets/_Project/Gallery/Lightmap-0_comp_light.exr deleted file mode 100644 index 4a6e6ad..0000000 Binary files a/Assets/_Project/Gallery/Lightmap-0_comp_light.exr and /dev/null differ diff --git a/Assets/_Project/Gallery/ReflectionProbe-0.exr b/Assets/_Project/Gallery/ReflectionProbe-0.exr deleted file mode 100644 index 9bb0dd8..0000000 Binary files a/Assets/_Project/Gallery/ReflectionProbe-0.exr and /dev/null differ diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/ICSharpCode.SharpZipLib.dll b/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/ICSharpCode.SharpZipLib.dll new file mode 100644 index 0000000..5fa13c7 Binary files /dev/null and b/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/ICSharpCode.SharpZipLib.dll differ diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/ICSharpCode.SharpZipLib.dll.meta b/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/ICSharpCode.SharpZipLib.dll.meta new file mode 100644 index 0000000..7627233 --- /dev/null +++ b/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/ICSharpCode.SharpZipLib.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: ec897c206a99abe41b093d5cc5ddc3fe +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/vpm-core-lib.dll b/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/vpm-core-lib.dll index 3cbc8f9..35e0fba 100644 Binary files a/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/vpm-core-lib.dll and b/Packages/com.vrchat.core.vpm-resolver/Editor/Dependencies/vpm-core-lib.dll differ diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs b/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs index 9bd8365..bed77b2 100644 --- a/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs +++ b/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindow.cs @@ -3,14 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; +using System.Text; using System.Text.RegularExpressions; using UnityEditor; using UnityEditor.UIElements; -using UnityEditor.VersionControl; using UnityEngine; using UnityEngine.UIElements; using VRC.PackageManagement.Core.Types.Packages; -using YamlDotNet.Serialization.NodeTypeResolvers; namespace VRC.PackageManagement.PackageMaker { @@ -22,6 +21,9 @@ namespace VRC.PackageManagement.PackageMaker private TextField _packageIDField; private Button _actionButton; private EnumField _targetVRCPackageField; + private TextField _authorNameField; + private TextField _authorEmailField; + private TextField _authorUrlField; private static string _projectDir; private PackageMakerWindowData _windowData; @@ -33,6 +35,9 @@ namespace VRC.PackageManagement.PackageMaker } _packageIDField.SetValueWithoutNotify(_windowData.packageID); _targetVRCPackageField.SetValueWithoutNotify(_windowData.relatedPackage); + _authorEmailField.SetValueWithoutNotify(_windowData.authorEmail); + _authorNameField.SetValueWithoutNotify(_windowData.authorName); + _authorUrlField.SetValueWithoutNotify(_windowData.authorUrl); RefreshActionButtonState(); } @@ -53,27 +58,30 @@ namespace VRC.PackageManagement.PackageMaker [MenuItem("Assets/Export VPM as UnityPackage")] private static void ExportAsUnityPackage () { - if (Selection.assetGUIDs.Length != 1) + + var foldersToExport = new List(); + StringBuilder exportFilename = new StringBuilder("exported"); + foreach (string guid in Selection.assetGUIDs) { - Debug.LogWarning($"Cannot export selection, must be a single Folder."); - return; - } - - string selectedFolder = AssetDatabase.GUIDToAssetPath(Selection.assetGUIDs[0]); - var manifestPath = Path.Combine(selectedFolder, VRCPackageManifest.Filename); - var manifest = VRCPackageManifest.GetManifestAtPath(manifestPath); - if (manifest == null) - { - Debug.LogWarning($"Could not read valid Package Manifest at {manifestPath}. You need to create this first."); - return; + string selectedFolder = AssetDatabase.GUIDToAssetPath(guid); + var manifestPath = Path.Combine(selectedFolder, VRCPackageManifest.Filename); + var manifest = VRCPackageManifest.GetManifestAtPath(manifestPath); + if (manifest == null) + { + Debug.LogWarning($"Could not read valid Package Manifest at {manifestPath}. You need to create this first to export a VPM Package."); + continue; + } + exportFilename.Append($"-{manifest.Id}-{manifest.Version}"); + foldersToExport.Add(selectedFolder); } + exportFilename.Append(".unitypackage"); var exportDir = Path.Combine(Directory.GetCurrentDirectory(), "Exports"); Directory.CreateDirectory(exportDir); AssetDatabase.ExportPackage ( - selectedFolder, - Path.Combine(exportDir, $"{manifest.Id}-{manifest.Version}.unitypackage"), + foldersToExport.ToArray(), + Path.Combine(exportDir, exportFilename.ToString()), ExportPackageOptions.Recurse | ExportPackageOptions.Interactive ); } @@ -97,7 +105,9 @@ namespace VRC.PackageManagement.PackageMaker { _actionButton.SetEnabled( StringIsValidAssetFolder(_windowData.targetAssetFolder) && - !string.IsNullOrWhiteSpace(_windowData.packageID) + !string.IsNullOrWhiteSpace(_windowData.packageID) && + _authorNameField.value != null && + IsValidEmail(_authorEmailField.value) ); } @@ -118,6 +128,7 @@ namespace VRC.PackageManagement.PackageMaker // Create Target Asset folder and register for drag and drop events _rootView.Add(CreateTargetFolderElement()); _rootView.Add(CreatePackageIDElement()); + _rootView.Add(CreateAuthorElement()); _rootView.Add(CreateTargetVRCPackageElement()); _rootView.Add(CreateActionButton()); @@ -202,6 +213,59 @@ namespace VRC.PackageManagement.PackageMaker return box; } + private VisualElement CreateAuthorElement() + { + // Construct author fields + _authorNameField = new TextField("Author Name"); + _authorEmailField = new TextField("Author Email"); + _authorUrlField = new TextField("Author URL (optional)"); + + // Save name to window data and toggle the Action Button if its status changed + _authorNameField.RegisterValueChangedCallback((evt) => + { + _windowData.authorName = evt.newValue; + Debug.Log($"Window author name is {evt.newValue}"); + RefreshActionButtonState(); + }); + + // Save email to window data if valid and toggle the Action Button if its status changed + _authorEmailField.RegisterValueChangedCallback((evt) => + { + // Only save email if it appears valid + if (IsValidEmail(evt.newValue)) + { + _windowData.authorEmail = evt.newValue; + } + RefreshActionButtonState(); + }); + + // Save url to window data, doesn't affect action button state + _authorUrlField.RegisterValueChangedCallback((evt) => + { + _windowData.authorUrl = evt.newValue; + }); + + // Add new fields to layout + var box = new Box(); + box.Add(_authorNameField); + box.Add(_authorEmailField); + box.Add(_authorUrlField); + return box; + } + + private bool IsValidEmail(string evtNewValue) + { + try + { + var addr = new System.Net.Mail.MailAddress(evtNewValue); + return addr.Address == evtNewValue; + } + catch + { + return false; + } + } + private Regex packageIdRegex = new Regex("[^a-z0-9.]"); private void OnPackageIDChanged(ChangeEvent evt) { @@ -331,13 +395,26 @@ namespace VRC.PackageManagement.PackageMaker } string parentDir = new DirectoryInfo(targetDir)?.Parent.FullName; - Core.Utilities.CreateStarterPackage(_windowData.packageID, parentDir, packageType); + var packageDir = Core.Utilities.CreateStarterPackage(_windowData.packageID, parentDir, packageType); + + // Modify manifest to add author + // Todo: add support for passing author into CreateStarterPackage + var manifest = + VRCPackageManifest.GetManifestAtPath(Path.Combine(packageDir, VRCPackageManifest.Filename)) as + VRCPackageManifest; + manifest.author = new Author() + { + email = _windowData.authorEmail, + name = _windowData.authorName, + url = _windowData.authorUrl + }; + manifest.Save(); + var allFiles = GetAllFiles(corePath).ToList(); MoveFilesToPackageDir(allFiles, corePath, targetDir); // Clear target asset folder since it should no longer exist _windowData.targetAssetFolder = ""; - } private static IEnumerable GetAllFiles(string path) diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindowData.cs b/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindowData.cs index ee580b7..df8eef6 100644 --- a/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindowData.cs +++ b/Packages/com.vrchat.core.vpm-resolver/Editor/PackageMaker/PackageMakerWindowData.cs @@ -8,6 +8,10 @@ public class PackageMakerWindowData : ScriptableObject public static string defaultAssetPath = Path.Combine("Assets", "PackageMakerWindowData.asset"); public string targetAssetFolder; public string packageID; + + public string authorName; + public string authorEmail; + public string authorUrl; public PackageMakerWindow.VRCPackageEnum relatedPackage; public static PackageMakerWindowData GetOrCreate() diff --git a/Packages/com.vrchat.core.vpm-resolver/Editor/Resolver/Resolver.cs b/Packages/com.vrchat.core.vpm-resolver/Editor/Resolver/Resolver.cs index cb1822e..805549d 100644 --- a/Packages/com.vrchat.core.vpm-resolver/Editor/Resolver/Resolver.cs +++ b/Packages/com.vrchat.core.vpm-resolver/Editor/Resolver/Resolver.cs @@ -11,6 +11,7 @@ using UnityEngine; using VRC.PackageManagement.Core; using VRC.PackageManagement.Core.Types; using VRC.PackageManagement.Core.Types.Packages; +using Version = VRC.PackageManagement.Core.Types.VPMVersion.Version; namespace VRC.PackageManagement.Resolver { diff --git a/Packages/com.vrchat.core.vpm-resolver/package.json b/Packages/com.vrchat.core.vpm-resolver/package.json index 19f862e..8e73045 100644 --- a/Packages/com.vrchat.core.vpm-resolver/package.json +++ b/Packages/com.vrchat.core.vpm-resolver/package.json @@ -1,10 +1,10 @@ { "name" : "com.vrchat.core.vpm-resolver", "displayName" : "VRChat Package Resolver Tool", - "version" : "0.1.17", + "version" : "0.1.21", "unity" : "2019.4", "description" : "Tool to Download VPM Packages", - "vrchatVersion" : "2022.1.1", + "vrchatVersion" : "2022.2.2", "author" : { "name" : "VRChat", "email" : "developer@vrchat.com", @@ -12,6 +12,6 @@ }, "url" : "", "dependencies" : { - "com.unity.nuget.newtonsoft-json" : "2.0.2" + "com.unity.nuget.newtonsoft-json" : "3.0.2" } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 41844bf..d952533 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -55,15 +55,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.inputsystem": { - "version": "1.2.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.mathematics": { "version": "1.2.5", "depth": 1, @@ -72,7 +63,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.2", + "version": "3.0.2", "depth": 1, "source": "registry", "dependencies": {}, @@ -149,16 +140,7 @@ "dependencies": { "com.unity.burst": "1.4.11", "com.unity.mathematics": "1.2.5", - "com.unity.nuget.newtonsoft-json": "2.0.2" - } - }, - "com.vrchat.clientsim": { - "version": "file:com.vrchat.clientsim", - "depth": 0, - "source": "embedded", - "dependencies": { - "com.unity.xr.oculus.standalone": "2.38.4", - "com.unity.inputsystem": "1.2.0" + "com.unity.nuget.newtonsoft-json": "3.0.2" } }, "com.vrchat.core.vpm-resolver": { diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index f7f1cad..e57d355 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -18,13 +18,13 @@ } }, "com.vrchat.worlds": { - "version": "3.1.11", + "version": "3.2.3", "dependencies": { - "com.vrchat.base": "3.1.11" + "com.vrchat.base": "3.2.3" } }, "com.vrchat.base": { - "version": "3.1.11", + "version": "3.2.3", "dependencies": {} }, "com.vrchat.clientsim": { @@ -34,7 +34,7 @@ } }, "com.vrchat.core.vpm-resolver": { - "version": "0.1.17", + "version": "0.1.21", "dependencies": {} } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e9289bd..01eae0a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -327,7 +327,7 @@ PlayerSettings: m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 - m_Automatic: 1 + m_Automatic: 0 - m_BuildTarget: AppleTVSupport m_APIs: 10000000 m_Automatic: 0 @@ -337,6 +337,9 @@ PlayerSettings: - m_BuildTarget: WindowsStandaloneSupport m_APIs: 02000000 m_Automatic: 0 + - m_BuildTarget: MacStandaloneSupport + m_APIs: 10000000 + m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 1 @@ -634,12 +637,13 @@ PlayerSettings: 33: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} scriptingBackend: {} - il2cppCompilerConfiguration: {} + il2cppCompilerConfiguration: + Standalone: 1 managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 - additionalIl2CppArgs: + additionalIl2CppArgs: --compiler-flags="" --linker-flags="" scriptingRuntimeVersion: 1 gcIncremental: 1 assemblyVersionValidation: 1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 42131f3..217010f 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -10,7 +10,7 @@ QualitySettings: name: VRC Low pixelLightCount: 4 shadows: 2 - shadowResolution: 2 + shadowResolution: 1 shadowProjection: 1 shadowCascades: 2 shadowDistance: 75 @@ -58,7 +58,7 @@ QualitySettings: skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 4 + antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 @@ -86,43 +86,6 @@ QualitySettings: shadows: 2 shadowResolution: 3 shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 75 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 4 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 0 - lodBias: 2 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 128 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: - - Android - - serializedVersion: 2 - name: VRC Ultra - pixelLightCount: 8 - shadows: 2 - shadowResolution: 3 - shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 shadowNearPlaneOffset: 2