Gitea Version: 1.25.2
diff --git a/Assets/Bakery/ftGlobalStorage.asset b/Assets/Bakery/ftGlobalStorage.asset index f9d0b837..77a19d7a 100644 --- a/Assets/Bakery/ftGlobalStorage.asset +++ b/Assets/Bakery/ftGlobalStorage.asset @@ -856,7 +856,8 @@ MonoBehaviour: - Assets/Models/Furniture/Kristo_s_Models/EM-09.2.blend - Assets/Models/Furniture/Kristo_s_Models/EM-16.blend - Assets/Models/Furniture/Kristo_s_Models/M-23.blend - uvOverlapAssetList: 00000000ffffffff0000000001010000000000000101000001010000 + - Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend + uvOverlapAssetList: 00000000ffffffff000000000101000000000000010100000101000001010000 xatlasWarningShown: 1 foundCompatibleSetup: 1 gpuName: NVIDIA GeForce RTX 2080 SUPER @@ -941,5 +942,5 @@ MonoBehaviour: renderSettingsRTPVSceneView: 0 renderSettingsRTPVWidth: 640 renderSettingsRTPVHeight: 360 - modifiedMeshPaddingArray: 35000000 + modifiedMeshPaddingArray: 72000000 modifiedMeshUnwrapperArray: 01000000 diff --git a/Assets/Scenes/Main_scene/LightingData.asset.meta b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta similarity index 54% rename from Assets/Scenes/Main_scene/LightingData.asset.meta rename to Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta index 6811715e..b0506f8d 100644 --- a/Assets/Scenes/Main_scene/LightingData.asset.meta +++ b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: dca4a5bebd964ef4e94938b3db9551b2 -NativeFormatImporter: +guid: b1b95168f2f925246bf670cb2bc2bf79 +DefaultImporter: externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Bakery/shader/Bakery_ShaderGraphURP.unitypackage.meta b/Assets/Bakery/shader/Bakery_ShaderGraphURP.unitypackage.meta new file mode 100644 index 00000000..103b6aff --- /dev/null +++ b/Assets/Bakery/shader/Bakery_ShaderGraphURP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ec3754b09ac1517429546e96e7b25708 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BakeryLightmaps/Main_scene_LM0_final.hdr.meta b/Assets/BakeryLightmaps/Main_scene_LM0_final.hdr.meta index bab93a54..f6167231 100644 --- a/Assets/BakeryLightmaps/Main_scene_LM0_final.hdr.meta +++ b/Assets/BakeryLightmaps/Main_scene_LM0_final.hdr.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -66,7 +66,19 @@ TextureImporter: maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/BakeryLightmaps/Main_scene_LMA1_final.hdr.meta b/Assets/BakeryLightmaps/Main_scene_LMA1_final.hdr.meta index 5d88c89a..089dec8b 100644 --- a/Assets/BakeryLightmaps/Main_scene_LMA1_final.hdr.meta +++ b/Assets/BakeryLightmaps/Main_scene_LMA1_final.hdr.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -66,7 +66,19 @@ TextureImporter: maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/BakeryLightmaps/Main_scene_LMA2_final.hdr.meta b/Assets/BakeryLightmaps/Main_scene_LMA2_final.hdr.meta index df867436..731d424c 100644 --- a/Assets/BakeryLightmaps/Main_scene_LMA2_final.hdr.meta +++ b/Assets/BakeryLightmaps/Main_scene_LMA2_final.hdr.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -66,7 +66,19 @@ TextureImporter: maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/BakeryLightmaps/Main_scene_LMA3_final.hdr.meta b/Assets/BakeryLightmaps/Main_scene_LMA3_final.hdr.meta index 1273a0ed..55a8d67a 100644 --- a/Assets/BakeryLightmaps/Main_scene_LMA3_final.hdr.meta +++ b/Assets/BakeryLightmaps/Main_scene_LMA3_final.hdr.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -66,7 +66,19 @@ TextureImporter: maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/BakeryLightmaps/Main_scene_LMA4_final.hdr.meta b/Assets/BakeryLightmaps/Main_scene_LMA4_final.hdr.meta index 31e08570..214de613 100644 --- a/Assets/BakeryLightmaps/Main_scene_LMA4_final.hdr.meta +++ b/Assets/BakeryLightmaps/Main_scene_LMA4_final.hdr.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -66,7 +66,19 @@ TextureImporter: maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/BakeryLightmaps/Main_scene_LMA5_final.hdr.meta b/Assets/BakeryLightmaps/Main_scene_LMA5_final.hdr.meta index e7cb47f7..bd58d34b 100644 --- a/Assets/BakeryLightmaps/Main_scene_LMA5_final.hdr.meta +++ b/Assets/BakeryLightmaps/Main_scene_LMA5_final.hdr.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -66,7 +66,19 @@ TextureImporter: maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Editor/x64/Bakery/.ftracelog.txt b/Assets/Editor/x64/Bakery/.ftracelog.txt index 6cdbbf7d..392123b1 100644 --- a/Assets/Editor/x64/Bakery/.ftracelog.txt +++ b/Assets/Editor/x64/Bakery/.ftracelog.txt @@ -42848,3 +42848,444 @@ Launched Loading shader dilateHalf.ptx::oxMain... Loading shader dilate.ptx::oxMain... Done +Init... +lodselect +Loading geometry... +Loading alphas... +Tile size: 1024 +Device 0: GeForce GTX 1660 (ON) +Used host memory: 0mb, available GPU memory: 5037mb +MODE: lodselect +USING FLOAT +Load shaders... +Loading shader lodselect.ptx::oxMain... +Loading shader lambert_lodselect.ptx::oxMain... +Loading shader shadow.ptx::oxMain... +Loading shader miss.ptx::oxMain... +Loading shader trimeshTexLODSelect.ptx::intersect... +Loading shader trimeshTexLODSelect.ptx::bbox... +Used host memory: 0mb, available GPU memory: 5037mb +Used host memory: 0mb, available GPU memory: 5037mb +Create buffer... +Num passes: 1 +Num tex: 1 +Pass lodselect_HDR... +Used host memory: 0mb, available GPU memory: 5037mb +Launch 1x1 tiles... +Tile 0x0... +Streaming...0 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +----- +Mem stats: +Total: 484 +Alphas: 0 +GI albedos: 0 +GI lightmaps: 0 +Light data: 0 +Output: 16 +UV GBuffer: 20 +Scene: 4544 +----- +Render time: 0.886 sec +Writing... +Done +Init... +fixpos12 +Loading geometry... +Loading alphas... +Tile size: 1024 +Device 0: GeForce GTX 1660 (ON) +Used host memory: 0mb, available GPU memory: 5037mb +MODE: fixpos12 +USING FLOAT +Load shaders... +Loading shader fixPos12.ptx::oxMain... +Loading shader lambert_backface_check.ptx::oxMain... +Loading shader shadow.ptx::oxMain... +Loading shader trimesh.ptx::intersect... +Loading shader trimesh.ptx::bbox... +Used host memory: 0mb, available GPU memory: 5037mb +Used host memory: 0mb, available GPU memory: 5037mb +Create buffer... +Num passes: 2 +Num tex: 2 +Pass uvpos_Main_scene_LM0.lz4_HDR... +Pass uvpos_Main_scene_LM0.lz4_Mask... +Used host memory: 0mb, available GPU memory: 5037mb +Launch 4x4 tiles... +Tile 0x0... +Streaming...0 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +----- +Mem stats: +Total: 747 +Alphas: 0 +GI albedos: 0 +GI lightmaps: 0 +Light data: 0 +Output: 272 +UV GBuffer: 40 +Scene: 4531 +----- +Tile 1x0... +Streaming...0 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x0... +Streaming...6 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x0... +Streaming...12 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 0x1... +Streaming...18 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 1x1... +Streaming...25 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x1... +Streaming...31 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x1... +Streaming...37 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 0x2... +Streaming...43 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 1x2... +Streaming...50 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x2... +Streaming...56 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x2... +Streaming...62 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 0x3... +Streaming...68 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 1x3... +Streaming...75 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x3... +Streaming...81 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x3... +Streaming...87 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Render time: 1.18 sec +Writing... +uvpos_Main_scene_LM0.lz4 +uvpos_Main_scene_LM0.lz4 +Done +Init... +lodselect +Loading geometry... +Loading alphas... +Tile size: 1024 +Device 0: GeForce GTX 1660 (ON) +Used host memory: 0mb, available GPU memory: 5037mb +MODE: lodselect +USING FLOAT +Load shaders... +Loading shader lodselect.ptx::oxMain... +Loading shader lambert_lodselect.ptx::oxMain... +Loading shader shadow.ptx::oxMain... +Loading shader miss.ptx::oxMain... +Loading shader trimeshTexLODSelect.ptx::intersect... +Loading shader trimeshTexLODSelect.ptx::bbox... +Used host memory: 0mb, available GPU memory: 5037mb +Used host memory: 0mb, available GPU memory: 5037mb +Create buffer... +Num passes: 1 +Num tex: 1 +Pass lodselect_HDR... +Used host memory: 0mb, available GPU memory: 5037mb +Launch 4x4 tiles... +Tile 0x0... +Streaming...0 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +----- +Mem stats: +Total: 484 +Alphas: 0 +GI albedos: 0 +GI lightmaps: 0 +Light data: 0 +Output: 256 +UV GBuffer: 20 +Scene: 4304 +----- +Tile 1x0... +Streaming...0 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 2x0... +Streaming...6 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 3x0... +Streaming...12 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 0x1... +Streaming...18 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 1x1... +Streaming...25 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 2x1... +Streaming...31 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 3x1... +Streaming...37 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 0x2... +Streaming...43 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 1x2... +Streaming...50 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 2x2... +Streaming...56 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 3x2... +Streaming...62 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 0x3... +Streaming...68 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 1x3... +Streaming...75 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 2x3... +Streaming...81 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Tile 3x3... +Streaming...87 +npd +Launching... +Used host memory: 0mb, available GPU memory: 4552mb +Render time: 0.812 sec +Writing... +Done +Init... +fixpos12 +Loading geometry... +Loading alphas... +Tile size: 1024 +Device 0: GeForce GTX 1660 (ON) +Used host memory: 0mb, available GPU memory: 5037mb +MODE: fixpos12 +USING FLOAT +Load shaders... +Loading shader fixPos12.ptx::oxMain... +Loading shader lambert_backface_check.ptx::oxMain... +Loading shader shadow.ptx::oxMain... +Loading shader trimesh.ptx::intersect... +Loading shader trimesh.ptx::bbox... +Used host memory: 0mb, available GPU memory: 5037mb +Used host memory: 0mb, available GPU memory: 5037mb +Create buffer... +Num passes: 2 +Num tex: 2 +Pass uvpos_Main_scene_LMA2.lz4_HDR... +Pass uvpos_Main_scene_LMA2.lz4_Mask... +Used host memory: 0mb, available GPU memory: 5037mb +Launch 4x4 tiles... +Tile 0x0... +Streaming...0 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +----- +Mem stats: +Total: 747 +Alphas: 0 +GI albedos: 0 +GI lightmaps: 0 +Light data: 0 +Output: 272 +UV GBuffer: 40 +Scene: 4531 +----- +Tile 1x0... +Streaming...0 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x0... +Streaming...6 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x0... +Streaming...12 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 0x1... +Streaming...18 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 1x1... +Streaming...25 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x1... +Streaming...31 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x1... +Streaming...37 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 0x2... +Streaming...43 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 1x2... +Streaming...50 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x2... +Streaming...56 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x2... +Streaming...62 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 0x3... +Streaming...68 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 1x3... +Streaming...75 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 2x3... +Streaming...81 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Tile 3x3... +Streaming...87 +nFNFPFSd +Launching... +Used host memory: 0mb, available GPU memory: 4289mb +Render time: 1.081 sec +Writing... +uvpos_Main_scene_LMA2.lz4 +uvpos_Main_scene_LMA2.lz4 +Done +Init... +lodselect +Loading geometry... +Loading alphas... +Tile size: 1024 +Device 0: GeForce GTX 1660 (ON) +Used host memory: 0mb, available GPU memory: 5037mb +MODE: lodselect +USING FLOAT +Load shaders... +Loading shader lodselect.ptx::oxMain... +Loading shader lambert_lodselect.ptx::oxMain... +Loading shader shadow.ptx::oxMain... +Loading shader miss.ptx::oxMain... +Loading shader trimeshTexLODSelect.ptx::intersect... +Loading shader trimeshTexLODSelect.ptx::bbox... +Used host memory: 0mb, available GPU memory: 5037mb +Used host memory: 0mb, available GPU memory: 5037mb +Create buffer... +Num passes: 1 +Num tex: 1 +Pass lodselect_HDR... +Used host memory: 0mb, available GPU memory: 5037mb +Launch 4x4 tiles... +Tile 0x0... +Streaming...0 +npd +Launching... +Error (-1): Unknown error (Details: Function "_rtContextLaunch2D" caught exception: Encountered a CUDA error: cudaDriver().CuMemcpyDtoH( dstHost, srcDevice, byteCount ) returned (700): Illegal address) + +ftrace (aka Bakery) - GPU Lightmapper by Mr F +Usage: ftrace RENDERMODE SCENEPATH OUTPUTNAME FLAGS PADDING LMID [MODESETTINGSFILE] [DIRECT] [VBTRACETEXNAME] +- RENDERMODE tells ftrace which pass to render. Possible values: +sun, suncloudshadow, arealight, texarealight, pointlight, batchpointlight, cubemaplight, cookielight, conelight, sky, skytex, skycubemap, texgi, fixpos, fixpos1, fixpos2, fixpos12, fixpos3D, lodselect, add, addmul, hdr2mask, addao, diradd, addsh, postadd, postdiradd, finemissive, ao, ao_patch, sss, skydir, skycubemapdir, texgidir, aodir, arealightdir, texarealightdir, sunrnm, suncloudshadowrnm, pointlightrnm, batchpointlightrnm, cubemaplightrnm, cookielightrnm, conelightrnm, skycubemaprnm, skyrnm, arealightrnm, texarealightrnm, texgirnm, sunsh, suncloudshadowsh, skycubemapsh, pointlightsh, batchpointlightsh, cubemaplightsh, cookielightsh, conelightsh, skysh, arealightsh, texarealightsh, texgish, ssssh, skytangentsh, sunprobesh, suncloudshadowprobesh, skycubemapprobesh, pointlightprobesh, batchpointlightprobesh, cubemaplightprobesh, cookielightprobesh, conelightprobesh, skyprobesh, arealightprobesh, texarealightprobesh, texgiprobesh, interactive. +- SCENEPATH is the scene files directory. +- OUTPUTNAME is output file name. +- FLAGS is output flags. When in doubt, use 4. +- PADDING defines the amount of dilation (expanding rendered pixels to prevent seams) +- LMID is the lightmap ID. Only objects with this ID in lmid.bin will be rendered. +- In fixpos12 rendermode MODESETTINGSFILE is treated as fake shadow bias. diff --git a/Assets/Editor/x64/Bakery/.uvgblog.txt b/Assets/Editor/x64/Bakery/.uvgblog.txt index ebc31509..18746a67 100644 --- a/Assets/Editor/x64/Bakery/.uvgblog.txt +++ b/Assets/Editor/x64/Bakery/.uvgblog.txt @@ -1068,3 +1068,44 @@ Done Done Done Done +2020-12-9 +Rendering UV GBuffer for Main_scene_LM0 50 +RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states... +Rendering faceted UV normal... +Rendering UV pos... +Rendering smooth UV pos... +Rendering UV GBuffer for Main_scene_LMA1 50 +RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states... +Rendering faceted UV normal... +Rendering UV pos... +Rendering smooth UV pos... +Rendering UV GBuffer for Main_scene_LMA2 50 +RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states... +Rendering faceted UV normal... +Rendering UV pos... +Rendering smooth UV pos... +Rendering UV GBuffer for Main_scene_LMA3 50 +RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states... +Rendering faceted UV normal... +Rendering UV pos... +Rendering smooth UV pos... +Rendering UV GBuffer for Main_scene_LMA4 50 +RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states... +Rendering faceted UV normal... +Rendering UV pos... +Rendering smooth UV pos... +Rendering UV GBuffer for Main_scene_LMA5 50 +RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states... +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 lodselect "C:\Users\tooma\AppData\Local\Temp\frender" "lodselect" 2 0 6 +Running ftrace fixpos12 "C:\Users\tooma\AppData\Local\Temp\frender" "uvpos_Main_scene_LM0.lz4" 34 0 0 0 +Running ftrace lodselect "C:\Users\tooma\AppData\Local\Temp\frender" "lodselect" 2 0 0 +Running ftrace fixpos12 "C:\Users\tooma\AppData\Local\Temp\frender" "uvpos_Main_scene_LMA2.lz4" 34 0 2 0 +Running ftrace lodselect "C:\Users\tooma\AppData\Local\Temp\frender" "lodselect" 2 0 2 +Waiting on threads to park on joinable thread list timed out. diff --git a/Assets/Materials/Outside/Light/Yellow Emissive.mat b/Assets/Materials/Outside/Light/Yellow Emissive.mat index a334b2ab..629211a5 100644 --- a/Assets/Materials/Outside/Light/Yellow Emissive.mat +++ b/Assets/Materials/Outside/Light/Yellow Emissive.mat @@ -106,6 +106,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 0.9019608, b: 0.57254905, a: 1} - _Color: {r: 1, g: 0.9019608, b: 0.57254905, a: 1} - - _EmissionColor: {r: 22.363522, g: 20.255964, b: 12.879515, a: 1} + - _EmissionColor: {r: 5.992157, g: 5.427451, b: 3.4509804, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend index a5446a02..338f5e87 100644 --- a/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend +++ b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e150cc70d84f649ff329cb4fd2a4e105c13f987fd5d79ae9c56089f683c667b4 -size 697900 +oid sha256:80b27fa2d339843a82e636f3cda875547f2b7ced364511fa8cddde461f755dc4 +size 766636 diff --git a/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend.meta b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend.meta index 060e3a66..1028c4be 100644 --- a/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend.meta +++ b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend.meta @@ -46,7 +46,7 @@ ModelImporter: importLights: 0 fileIdsGeneration: 1 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 @@ -60,7 +60,7 @@ ModelImporter: secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15 secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 0 + secondaryUVMarginMethod: 1 secondaryUVMinLightmapResolution: 16 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 64 diff --git a/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend1 b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend1 new file mode 100644 index 00000000..1dd1b47f Binary files /dev/null and b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend1 differ diff --git a/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend1.meta b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend1.meta new file mode 100644 index 00000000..2eedec91 --- /dev/null +++ b/Assets/Models/Furniture/Aleksandra_s_Models/M-01.1.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 01dc737403664ed4a9ffb3663d1242be +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects (Prefabs)/Furniture_Outside/BikeStop.prefab b/Assets/Objects (Prefabs)/Furniture_Outside/BikeStop.prefab index 164870e4..8eb4ce35 100644 --- a/Assets/Objects (Prefabs)/Furniture_Outside/BikeStop.prefab +++ b/Assets/Objects (Prefabs)/Furniture_Outside/BikeStop.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &4462361670005430545 Transform: @@ -55,6 +55,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -79,6 +80,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2364991462674371158 GameObject: m_ObjectHideFlags: 0 @@ -95,7 +97,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &7336651657432215147 Transform: @@ -134,6 +136,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -158,6 +161,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &3148331755114983519 GameObject: m_ObjectHideFlags: 0 @@ -174,7 +178,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &138930758311040691 Transform: @@ -213,6 +217,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -237,6 +242,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &3511552481085346311 GameObject: m_ObjectHideFlags: 0 @@ -253,7 +259,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &796188778983524260 Transform: @@ -292,6 +298,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -316,6 +323,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &3772677913916705878 GameObject: m_ObjectHideFlags: 0 @@ -370,7 +378,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &7860557903142091654 Transform: @@ -409,6 +417,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -433,6 +442,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6848663248196965887 GameObject: m_ObjectHideFlags: 0 @@ -449,7 +459,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &1385346902797921308 Transform: @@ -488,6 +498,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -512,6 +523,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &7332791234107148134 GameObject: m_ObjectHideFlags: 0 @@ -528,7 +540,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &3384214723236070955 Transform: @@ -567,6 +579,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -591,6 +604,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8474893399987695701 GameObject: m_ObjectHideFlags: 0 @@ -607,7 +621,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 1 m_IsActive: 1 --- !u!4 &142837312835258571 Transform: @@ -646,6 +660,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -670,3 +685,4 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Objects (Prefabs)/Seats/Seat_Aud_Main.prefab b/Assets/Objects (Prefabs)/Seats/Seat_Aud_Main.prefab index f58ae644..e5baa815 100644 --- a/Assets/Objects (Prefabs)/Seats/Seat_Aud_Main.prefab +++ b/Assets/Objects (Prefabs)/Seats/Seat_Aud_Main.prefab @@ -14,7 +14,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &3140198768894487210 Transform: @@ -23,95 +23,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3140198768894487221} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -43.34, y: 0.097, z: -29.93} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3515598192515731734} - {fileID: 4404941288242013149} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3140198768847999951 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3140198768894487210} - m_Modifications: - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1971965073990222553, guid: 1e4da7254e74b844d9b944c13d090f2b, - type: 3} - prop
Gitea Version: 1.25.2