diff --git a/Assets/Oculus/Spatializer/Plugins/Android/libs/arm64-v8a/libAudioPluginOculusSpatializer.so.meta b/Assets/Oculus/Spatializer/Plugins/Android/libs/arm64-v8a/libAudioPluginOculusSpatializer.so.meta index ceae6775..c2554c36 100644 --- a/Assets/Oculus/Spatializer/Plugins/Android/libs/arm64-v8a/libAudioPluginOculusSpatializer.so.meta +++ b/Assets/Oculus/Spatializer/Plugins/Android/libs/arm64-v8a/libAudioPluginOculusSpatializer.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a57801270cf689244b48012cf9db1713 +guid: d0eebc7bf3d4b7f40bac325a9261f21c PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Other/Delta (Toomas) v0.blend.meta b/Assets/Other/Delta (Toomas) v0.blend.meta index 80eb8137..72578338 100644 --- a/Assets/Other/Delta (Toomas) v0.blend.meta +++ b/Assets/Other/Delta (Toomas) v0.blend.meta @@ -60,9 +60,9 @@ ModelImporter: secondaryUVAreaDistortion: 15 secondaryUVHardAngle: 88 secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 80 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 + secondaryUVMinLightmapResolution: 16 + secondaryUVMinObjectScale: 4 + secondaryUVPackMargin: 64 useFileScale: 1 tangentSpace: normalSmoothAngle: 60 diff --git a/Assets/Scenes/Delta occlusion test.blend b/Assets/Scenes/Delta occlusion test.blend deleted file mode 100644 index a213fa23..00000000 --- a/Assets/Scenes/Delta occlusion test.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c63f64da407c5e6e9ecd9914d9add5e62edc906872385577d7252e7f426bdc5b -size 25009184 diff --git a/Assets/Scenes/Delta occlusion test.blend.meta b/Assets/Scenes/Delta occlusion test.blend.meta deleted file mode 100644 index 41a7020f..00000000 --- a/Assets/Scenes/Delta occlusion test.blend.meta +++ /dev/null @@ -1,101 +0,0 @@ -fileFormatVersion: 2 -guid: bb67a8f2bd4596b48b4a593db6857d31 -ModelImporter: - serializedVersion: 20101 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 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: 1 - useSRGBMaterialColor: 0 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - 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 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Delta occlusion test.dae b/Assets/Scenes/Delta occlusion test.dae deleted file mode 100644 index 26c50056..00000000 --- a/Assets/Scenes/Delta occlusion test.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f666503542d4612c6c276b84dea74af40b6b5ccadb67796851e8d0e35c1b15ec -size 26785520 diff --git a/Assets/Scenes/Delta occlusion test.dae.meta b/Assets/Scenes/Delta occlusion test.dae.meta deleted file mode 100644 index c58e0af6..00000000 --- a/Assets/Scenes/Delta occlusion test.dae.meta +++ /dev/null @@ -1,101 +0,0 @@ -fileFormatVersion: 2 -guid: 74c1cc4d38d1aa544807998969a8317e -ModelImporter: - serializedVersion: 20101 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 1 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 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 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - 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 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Main_scene.unity b/Assets/Scenes/Main_scene.unity index eb6b13f8..0b6c2c4a 100644 --- a/Assets/Scenes/Main_scene.unity +++ b/Assets/Scenes/Main_scene.unity @@ -270396,7 +270396,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5682466812336811675, guid: 74c1cc4d38d1aa544807998969a8317e, type: 3} + - {fileID: -5682466812336811675, guid: e94e88318bdcfb94284cc61b3def72d5, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scenes/Main_scene/LightingData.asset b/Assets/Scenes/Main_scene/LightingData.asset index 9339c465..9f463673 100644 Binary files a/Assets/Scenes/Main_scene/LightingData.asset and b/Assets/Scenes/Main_scene/LightingData.asset differ diff --git a/Assets/Scenes/Main_scene/Lightmap-0_comp_dir.png b/Assets/Scenes/Main_scene/Lightmap-0_comp_dir.png deleted file mode 100644 index 152f62e2..00000000 --- a/Assets/Scenes/Main_scene/Lightmap-0_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9ed15d3708745123d254a42dbade8fff6918d9f868c8361ec130508dfdeb104 -size 1054066 diff --git a/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr index 5ae8cc2b..21106553 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr.meta index 042b3012..761feb81 100644 --- a/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr.meta +++ b/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr.meta @@ -63,7 +63,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr new file mode 100644 index 00000000..8b7ef752 Binary files /dev/null and b/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr.meta similarity index 94% rename from Assets/Scenes/Main_scene/Lightmap-0_comp_dir.png.meta rename to Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr.meta index 6368b493..24df7068 100644 --- a/Assets/Scenes/Main_scene/Lightmap-0_comp_dir.png.meta +++ b/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bbce3d3777dbb3541b5db9841d3ebeee +guid: 9c6f47ba4ebe65047a193b7d5150f698 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -49,10 +49,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -63,7 +63,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr new file mode 100644 index 00000000..53c225dd Binary files /dev/null and b/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr.meta new file mode 100644 index 00000000..114d0d49 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: a4d5abfc00fd1f9439db365d7316e53f +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 + vTOnly: 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 + ignorePngGamma: 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/Scenes/Main_scene/Lightmap-3_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr new file mode 100644 index 00000000..b5f987ec Binary files /dev/null and b/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr.meta new file mode 100644 index 00000000..fd658be2 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 6714e6803384143478498e85dd580919 +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 + vTOnly: 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 + ignorePngGamma: 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/Scenes/Main_scene/Lightmap-4_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr new file mode 100644 index 00000000..08c7b3dd Binary files /dev/null and b/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr.meta new file mode 100644 index 00000000..b07254c0 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 4475f6e85271b6e4998068c67dd27c37 +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 + vTOnly: 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 + ignorePngGamma: 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/Scenes/Main_scene/Lightmap-5_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr new file mode 100644 index 00000000..3fb32d29 Binary files /dev/null and b/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr.meta new file mode 100644 index 00000000..6875b4c1 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: ce75104a904f3354bb0f45d3883a7866 +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 + vTOnly: 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 + ignorePngGamma: 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/Scenes/Main_sceneSettings.lighting b/Assets/Scenes/Main_sceneSettings.lighting index 5b0441a7..71ee5c66 100644 --- a/Assets/Scenes/Main_sceneSettings.lighting +++ b/Assets/Scenes/Main_sceneSettings.lighting @@ -16,9 +16,9 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 4 m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 4096 - m_BakeResolution: 80 + m_BakeBackend: 2 + m_LightmapMaxSize: 2048 + m_BakeResolution: 16 m_Padding: 2 m_TextureCompression: 1 m_AO: 1 @@ -40,7 +40,7 @@ LightingSettings: m_FinalGatherFiltering: 1 m_PVRCulling: 0 m_PVRSampling: 1 - m_PVRDirectSampleCount: 64 + m_PVRDirectSampleCount: 32 m_PVRSampleCount: 580 m_PVREnvironmentSampleCount: 256 m_PVREnvironmentReferencePointCount: 2048 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3998778a..fe2f670b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -130,7 +130,7 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.subsystemregistration": "1.0.5" + "com.unity.subsystemregistration": "1.0.6" }, "url": "https://packages.unity.com" },