Merge branch 'main' into quest

loooot
2024-08-05 18:33:35 +03:00 · 2024-08-05 18:28:03 +03:00
35 changed files with 22455 additions and 26651 deletions
--- a/desert/2.6.unity
+++ b/desert/2.6.unity
--- a/boird/5776766.jpg.png
+++ b/boird/5776766.jpg.png
--- a/boird/5776766.jpg.png.meta
+++ b/boird/5776766.jpg.png.meta
@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 6bc4955e23360834c9eacfffa76161ab
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/boird/Materials/GRIOTFY.mat
+++ b/boird/Materials/GRIOTFY.mat
@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GRIOTFY
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 6bc4955e23360834c9eacfffa76161ab, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 6bc4955e23360834c9eacfffa76161ab, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
--- a/boird/Materials/GRIOTFY.mat.meta
+++ b/boird/Materials/GRIOTFY.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cd31d2df0defbba4d8fa4f9200c521f6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/1-arab
+++ b/Assets/1-arab
@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: red 1
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0.3
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.7254902, g: 0.454902, b: 0.8588236, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/1-arab
+++ b/Assets/1-arab
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b392bc743e156142a35947deb038d57
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Bakery/_tempScene.unity
+++ b/Assets/Bakery/_tempScene.unity
--- a/Assets/Bakery/_tempScene/LightingData.asset
+++ b/Assets/Bakery/_tempScene/LightingData.asset
--- a/Assets/BakeryLightmaps/2.6_371857150_probes.asset
+++ b/Assets/BakeryLightmaps/2.6_371857150_probes.asset
--- a/Assets/BakeryLightmaps/2.6_LM0_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LM0_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LM0_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LM0_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA1_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA1_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA1_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA1_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA2_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA2_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA2_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA2_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA3_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA3_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA3_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA3_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA4_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA4_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA4_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA4_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA5_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA5_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA5_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA5_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA6_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA6_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA6_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA6_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA7_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA7_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA7_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA7_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA8_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA8_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA8_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA8_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/BakeryLightmaps/2.6_LMA9_final.hdr
+++ b/Assets/BakeryLightmaps/2.6_LMA9_final.hdr
--- a/Assets/BakeryLightmaps/2.6_LMA9_final.hdr.meta
+++ b/Assets/BakeryLightmaps/2.6_LMA9_final.hdr.meta
@ -69,7 +69,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 4096
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Editor/x64/Bakery/.denoiserlog.txt
+++ b/Assets/Editor/x64/Bakery/.denoiserlog.txt
@ -952,3 +952,63 @@ Tiles: 2
 Loading shader denoisePrepareOIDN.ptx::oxMain...
 Loading shader denoiseFinishOIDN.ptx::oxMain...
 Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-8-5
+Init...
+Tiles: 2
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
--- a/Assets/Editor/x64/Bakery/.ftracelog.txt
+++ b/Assets/Editor/x64/Bakery/.ftracelog.txt
--- a/Assets/Editor/x64/Bakery/.uvgblog.txt
+++ b/Assets/Editor/x64/Bakery/.uvgblog.txt
@ -2892,3 +2892,231 @@ Done
 Done
 Done
 Done
+2024-8-3
+Rendering UV GBuffer for 2.6_LM0 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA1 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA2 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA3 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA4 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA5 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA6 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA7 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA8 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA9 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for probes 256
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Done
+Done
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA5.lz4" 2 0 5 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA7.lz4" 2 0 7 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA6.lz4" 2 0 6 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA4.lz4" 2 0 4 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA8.lz4" 2 0 8 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA2.lz4" 2 0 2 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LM0.lz4" 2 0 0 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA9.lz4" 2 0 9 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA1.lz4" 2 0 1 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA3.lz4" 2 0 3 0
+Running ftrace skycubemapprobesh "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_10" 1924 0 10 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "probes" 4 0 10 comp_10.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_5" 4 0 5 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA5" 4 0 5 comp_5.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_7" 4 0 7 sky0.bin
+2024-8-5
+Rendering UV GBuffer for 2.6_LM0 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA1 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA2 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA3 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA4 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA5 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA6 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA7 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA8 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for 2.6_LMA9 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Rendering UV GBuffer for probes 256
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Done
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA5.lz4" 2 0 5 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA7.lz4" 2 0 7 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA6.lz4" 2 0 6 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA4.lz4" 2 0 4 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA8.lz4" 2 0 8 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA2.lz4" 2 0 2 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LM0.lz4" 2 0 0 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA9.lz4" 2 0 9 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA1.lz4" 2 0 1 0
+Running ftrace fixpos12 "C:\Users\wwwwe\AppData\Local\Temp\frender" "uvpos_2.6_LMA3.lz4" 2 0 3 0
+Running ftrace skycubemapprobesh "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_10" 1924 0 10 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "probes" 4 0 10 comp_10.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_5" 4 0 5 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA5" 4 0 5 comp_5.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_7" 4 0 7 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA7" 4 0 7 comp_7.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_6" 4 0 6 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA6" 4 0 6 comp_6.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_4" 4 0 4 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA4" 4 0 4 comp_4.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_8" 4 0 8 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA8" 4 0 8 comp_8.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_2" 4 0 2 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA2" 4 0 2 comp_2.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_0" 4 0 0 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LM0" 4 0 0 comp_0.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_9" 4 0 9 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA9" 4 0 9 comp_9.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_1" 4 0 1 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA1" 4 0 1 comp_1.bin
+Running ftrace skycubemap "C:\Users\wwwwe\AppData\Local\Temp\frender" "light_1_3" 4 0 3 sky0.bin
+Running ftrace addmul "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA3" 4 0 3 comp_3.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA5_diffuse" 4 16 5 "gi_2.6_LMA50.bin" "2.6_LMA5_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA7_diffuse" 4 16 7 "gi_2.6_LMA70.bin" "2.6_LMA7_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA6_diffuse" 4 16 6 "gi_2.6_LMA60.bin" "2.6_LMA6_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA4_diffuse" 4 16 4 "gi_2.6_LMA40.bin" "2.6_LMA4_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA8_diffuse" 4 16 8 "gi_2.6_LMA80.bin" "2.6_LMA8_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA2_diffuse" 4 16 2 "gi_2.6_LMA20.bin" "2.6_LMA2_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LM0_diffuse" 4 16 0 "gi_2.6_LM00.bin" "2.6_LM0_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA9_diffuse" 4 16 9 "gi_2.6_LMA90.bin" "2.6_LMA9_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA1_diffuse" 4 16 1 "gi_2.6_LMA10.bin" "2.6_LMA1_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA3_diffuse" 4 16 3 "gi_2.6_LMA30.bin" "2.6_LMA3_diffuse0_HDR.lz4" vbTraceTex.bin
+Running ftrace texgiprobesh "C:\Users\wwwwe\AppData\Local\Temp\frender" "probes_final" 1924 16 10 "gi_probes1.bin" "probes_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA5_final" 4 16 5 "gi_2.6_LMA51.bin" "2.6_LMA5_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA7_final" 4 16 7 "gi_2.6_LMA71.bin" "2.6_LMA7_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA6_final" 4 16 6 "gi_2.6_LMA61.bin" "2.6_LMA6_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA4_final" 4 16 4 "gi_2.6_LMA41.bin" "2.6_LMA4_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA8_final" 4 16 8 "gi_2.6_LMA81.bin" "2.6_LMA8_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA2_final" 4 16 2 "gi_2.6_LMA21.bin" "2.6_LMA2_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LM0_final" 4 16 0 "gi_2.6_LM01.bin" "2.6_LM0_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA9_final" 4 16 9 "gi_2.6_LMA91.bin" "2.6_LMA9_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA1_final" 4 16 1 "gi_2.6_LMA11.bin" "2.6_LMA1_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace texgi "C:\Users\wwwwe\AppData\Local\Temp\frender" "2.6_LMA3_final" 4 16 3 "gi_2.6_LMA31.bin" "2.6_LMA3_lights_HDR.lz4" vbTraceTex.bin
+Running ftrace addsh "C:\Users\wwwwe\AppData\Local\Temp\frender" "probes_final_" 4 0 10 shcomp_10.bin
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA5_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA5_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "5" "2.6_LMA5_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA7_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA7_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "7" "2.6_LMA7_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA6_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA6_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "6" "2.6_LMA6_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA4_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA4_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "4" "2.6_LMA4_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA8_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA8_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "8" "2.6_LMA8_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA2_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA2_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "2" "2.6_LMA2_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LM0_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LM0_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "0" "2.6_LM0_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA9_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA9_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "9" "2.6_LMA9_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA1_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA1_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "1" "2.6_LMA1_final_HDR.lz4"
+Running denoiserOIDN c "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA3_final_HDR.lz4" "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA3_final_HDR.lz4" 2048 1
+Running seamfixer "C:\Users\wwwwe\AppData\Local\Temp\frender" "3" "2.6_LMA3_final_HDR.lz4"
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA5_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA5_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA7_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA7_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA6_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA6_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA4_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA4_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA8_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA8_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA2_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA2_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LM0_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LM0_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA9_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA9_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA1_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA1_final.hdr" 1024
+Running halffloat2hdr "C:\Users\wwwwe\AppData\Local\Temp\frender/2.6_LMA3_final_HDR.lz4" "E:/vrc/Arab-desert-Git-Migrated/Assets/BakeryLightmaps/2.6_LMA3_final.hdr" 1024
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -423,7 +423,7 @@ PlayerSettings:
    m_Automatic: 0
  - m_BuildTarget: iOSSupport
    m_APIs: 10000000
-    m_Automatic: 0
+    m_Automatic: 1
  - m_BuildTarget: AppleTVSupport
    m_APIs: 10000000
    m_Automatic: 1
--- a/bakery_times.log
+++ b/bakery_times.log
@ -12,3 +12,4 @@
 04/10/2024 18:08 | 2.6 | 1h 12m 14s
 04/10/2024 22:03 | 2.6 | 1h 13m 21s
 04/20/2024 19:39 | 2.6 | 0h 26m 16s
+08/05/2024 18:27 | 2.6 | 0h 20m 25s
Author	SHA1	Message	Date
Saad AlKathiri	efdb609d47	Merge branch 'main' into quest	2024-08-05 18:33:35 +03:00
Saad AlKathiri	fdb9f5b9c7	loooot	2024-08-05 18:28:03 +03:00