Merge branch 'master' of git@gitlab.sd-zeus.com:yangzeyu/SCVerificationPipelineDT.git

68922004 · 杨泽宇 · 937fad3e · 9d31a992 · 638e9b32 · 20f7fd6e
Commit 68922004 authored May 16, 2024 by 杨泽宇
10 changed files
--- a/ZeusUIS @ 638e9b32
+++ b/ZeusUIS @ 638e9b32
-Subproject commit 3b449ef867bbff2570f48bbb0a586eaba17b85dc
+Subproject commit 638e9b3251beb499294c975a9f6d9827dda62d21
--- a/ZeusUtility @ 20f7fd6e
+++ b/ZeusUtility @ 20f7fd6e
-Subproject commit 921bf6dd3658a157696d6dc9d5faa65dcea90d27
+Subproject commit 20f7fd6e3d900eb203ace454c13bdc31a36c527c
--- a/Assets/_Scenes/测试场景/HJL.unity
+++ b/Assets/_Scenes/测试场景/HJL.unity
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA1_final.hdr
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA1_final.hdr
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA2_final.hdr
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA2_final.hdr
--- a/Assets/_美术资源/模型/建筑/科曼_墙体.fbx.meta
+++ b/Assets/_美术资源/模型/建筑/科曼_墙体.fbx.meta
-fileFormatVersion: 2
-guid: 194ce8f180486b4418df6371a34296af
-ModelImporter:
-  serializedVersion: 22200
-  internalIDToNameTable: []
-  externalObjects:
-  - first:
-      type: UnityEngine:Material
-      assembly: UnityEngine.CoreModule
-      name: "Pat1_\u6A58\u7EA2"
-    second: {fileID: 2100000, guid: 8b2f487573c0f304d9f02dffeac697c3, type: 2}
-  materials:
-    materialImportMode: 0
-    materialName: 0
-    materialSearch: 1
-    materialLocation: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    removeConstantScaleCurves: 0
-    motionNodeName: 
-    rigImportErrors: 
-    rigImportWarnings: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    importAnimatedCustomProperties: 0
-    importConstraints: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    extraUserProperties: []
-    clipAnimations: []
-    isReadable: 0
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    useSRGBMaterialColor: 1
-    sortHierarchyByName: 1
-    importPhysicalCameras: 1
-    importVisibility: 0
-    importBlendShapes: 1
-    importCameras: 0
-    importLights: 0
-    nodeNameCollisionStrategy: 0
-    fileIdsGeneration: 2
-    swapUVChannels: 0
-    generateSecondaryUV: 1
-    useFileUnits: 1
-    keepQuads: 0
-    weldVertices: 1
-    bakeAxisConversion: 0
-    preserveHierarchy: 0
-    skinWeightsMode: 0
-    maxBonesPerVertex: 4
-    minBoneWeight: 0.001
-    optimizeBones: 1
-    meshOptimizationFlags: -1
-    indexFormat: 0
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVMarginMethod: 0
-    secondaryUVMinLightmapResolution: 40
-    secondaryUVMinObjectScale: 1
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-    strictVertexDataChecks: 0
-  tangentSpace:
-    normalSmoothAngle: 70
-    normalImportMode: 1
-    tangentImportMode: 3
-    normalCalculationMode: 4
-    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
-    blendShapeNormalImportMode: 1
-    normalSmoothingSource: 0
-  referencedClips: []
-  importAnimation: 0
-  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: 0
-  humanoidOversampling: 1
-  avatarSetup: 0
-  addHumanoidExtraRootOnlyWhenUsingAvatar: 0
-  importBlendShapeDeformPercent: 0
-  remapMaterialsIfMaterialImportModeIsNone: 1
-  additionalBone: 0
-  userData: 636981689267257053
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_预设/场景.prefab
+++ b/Assets/_预设/场景.prefab
--- a/Assets/第三方库/Bakery/Editor/x64/Bakery/.ftracelog.txt
+++ b/Assets/第三方库/Bakery/Editor/x64/Bakery/.ftracelog.txt
--- a/Assets/第三方库/Bakery/Editor/x64/Bakery/.uvgblog.txt
+++ b/Assets/第三方库/Bakery/Editor/x64/Bakery/.uvgblog.txt
@@ -189,3 +189,77 @@ Running denoiserOIDN c "G:/Temp/New Scene_LMA1_final_HDR.lz4" "G:/Temp/New Scene
 Running seamfixer "G:/Temp" "1" "New Scene_LMA1_final_HDR.lz4"
 Running halffloat2hdr "G:/Temp/New Scene_LM0_final_HDR.lz4" "G:/WorkSpace/Unity/DigitalTwinTemplate/Assets/_Scenes/New Scene/New Scene_LM0_final.hdr" 1024
 Running halffloat2hdr "G:/Temp/New Scene_LMA1_final_HDR.lz4" "G:/WorkSpace/Unity/DigitalTwinTemplate/Assets/_Scenes/New Scene/New Scene_LMA1_final.hdr" 1024
+2024-5-16
+Rendering UV GBuffer for HJL_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 HJL_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 HJL_LMA2 51
+RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
+Rendering UV normal...
+Rendering faceted UV normal...
+Rendering UV pos...
+Rendering smooth UV pos...
+Done
+Done
+Running ftraceRTX fixpos12 "F:/bakery" "uvpos_HJL_LM0.lz4" 34 0 0 0
+Running ftraceRTX lodselect "F:/bakery" "lodselect" 2 0 0
+Running ftraceRTX fixpos12 "F:/bakery" "uvpos_HJL_LMA1.lz4" 34 0 1 0
+Running ftraceRTX lodselect "F:/bakery" "lodselect" 2 0 1
+Running ftraceRTX fixpos12 "F:/bakery" "uvpos_HJL_LMA2.lz4" 34 0 2 0
+Running ftraceRTX lodselect "F:/bakery" "lodselect" 2 0 2
+Running ftraceRTX arealight "F:/bakery" "light_-659097177_0" 4 0 0 lights0.bin
+Running ftraceRTX arealight "F:/bakery" "light_511053805_0" 4 0 0 lights1.bin
+Running ftraceRTX arealight "F:/bakery" "light_401305987_0" 4 0 0 lights2.bin
+Running ftraceRTX arealight "F:/bakery" "light_-591924169_0" 4 0 0 lights3.bin
+Running ftraceRTX arealight "F:/bakery" "light_589991936_0" 4 0 0 lights4.bin
+Running ftraceRTX batchpointlight "F:/bakery" "PointBatch_0_0_49" 4 0 0 batchpointlight_0_0_49.bin
+Running ftraceRTX addmul "F:/bakery" "HJL_LM0" 4 0 0 comp_0.bin
+Running ftraceRTX arealight "F:/bakery" "light_-659097177_1" 4 0 1 lights0.bin
+Running ftraceRTX arealight "F:/bakery" "light_511053805_1" 4 0 1 lights1.bin
+Running ftraceRTX arealight "F:/bakery" "light_401305987_1" 4 0 1 lights2.bin
+Running ftraceRTX arealight "F:/bakery" "light_-591924169_1" 4 0 1 lights3.bin
+Running ftraceRTX arealight "F:/bakery" "light_589991936_1" 4 0 1 lights4.bin
+Running ftraceRTX batchpointlight "F:/bakery" "PointBatch_1_0_49" 4 0 1 batchpointlight_1_0_49.bin
+Running ftraceRTX addmul "F:/bakery" "HJL_LMA1" 4 0 1 comp_1.bin
+Running ftraceRTX arealight "F:/bakery" "light_-659097177_2" 4 0 2 lights0.bin
+Running ftraceRTX arealight "F:/bakery" "light_511053805_2" 4 0 2 lights1.bin
+Running ftraceRTX arealight "F:/bakery" "light_401305987_2" 4 0 2 lights2.bin
+Running ftraceRTX arealight "F:/bakery" "light_-591924169_2" 4 0 2 lights3.bin
+Running ftraceRTX arealight "F:/bakery" "light_589991936_2" 4 0 2 lights4.bin
+Running ftraceRTX batchpointlight "F:/bakery" "PointBatch_2_0_49" 4 0 2 batchpointlight_2_0_49.bin
+Running ftraceRTX addmul "F:/bakery" "HJL_LMA2" 4 0 2 comp_2.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LM0_diffuse" 4 16 0 "gi_HJL_LM00.bin" "HJL_LM0_diffuse0_HDR.lz4" vbTraceTex0.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA1_diffuse" 4 16 1 "gi_HJL_LMA10.bin" "HJL_LMA1_diffuse0_HDR.lz4" vbTraceTex1.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA2_diffuse" 4 16 2 "gi_HJL_LMA20.bin" "HJL_LMA2_diffuse0_HDR.lz4" vbTraceTex2.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LM0_diffuse" 4 16 0 "gi_HJL_LM01.bin" "HJL_LM0_diffuse0_HDR.lz4" vbTraceTex0.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA1_diffuse" 4 16 1 "gi_HJL_LMA11.bin" "HJL_LMA1_diffuse0_HDR.lz4" vbTraceTex1.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA2_diffuse" 4 16 2 "gi_HJL_LMA21.bin" "HJL_LMA2_diffuse0_HDR.lz4" vbTraceTex2.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LM0_diffuse" 4 16 0 "gi_HJL_LM02.bin" "HJL_LM0_diffuse0_HDR.lz4" vbTraceTex0.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA1_diffuse" 4 16 1 "gi_HJL_LMA12.bin" "HJL_LMA1_diffuse0_HDR.lz4" vbTraceTex1.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA2_diffuse" 4 16 2 "gi_HJL_LMA22.bin" "HJL_LMA2_diffuse0_HDR.lz4" vbTraceTex2.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LM0_diffuse" 4 16 0 "gi_HJL_LM03.bin" "HJL_LM0_diffuse0_HDR.lz4" vbTraceTex0.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA1_diffuse" 4 16 1 "gi_HJL_LMA13.bin" "HJL_LMA1_diffuse0_HDR.lz4" vbTraceTex1.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA2_diffuse" 4 16 2 "gi_HJL_LMA23.bin" "HJL_LMA2_diffuse0_HDR.lz4" vbTraceTex2.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LM0_final" 20 16 0 "gi_HJL_LM04.bin" "HJL_LM0_lights_HDR.lz4" vbTraceTex0.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA1_final" 20 16 1 "gi_HJL_LMA14.bin" "HJL_LMA1_lights_HDR.lz4" vbTraceTex1.bin
+Running ftraceRTX texgi "F:/bakery" "HJL_LMA2_final" 20 16 2 "gi_HJL_LMA24.bin" "HJL_LMA2_lights_HDR.lz4" vbTraceTex2.bin
+Running ftraceRTX add "F:/bakery" "HJL_LM0_final_HDR.lz4" 4 0 0 comp_indirect0.bin
+Running ftraceRTX add "F:/bakery" "HJL_LMA1_final_HDR.lz4" 4 0 1 comp_indirect1.bin
+Running ftraceRTX add "F:/bakery" "HJL_LMA2_final_HDR.lz4" 4 0 2 comp_indirect2.bin
+Running denoiserOIDN c "F:/bakery/HJL_LM0_final_HDR.lz4" "F:/bakery/HJL_LM0_final_HDR.lz4" 512 0
+Running seamfixer "F:/bakery" "0" "HJL_LM0_final_HDR.lz4"
+Running denoiserOIDN c "F:/bakery/HJL_LMA1_final_HDR.lz4" "F:/bakery/HJL_LMA1_final_HDR.lz4" 512 0
+Running seamfixer "F:/bakery" "1" "HJL_LMA1_final_HDR.lz4"
+Running denoiserOIDN c "F:/bakery/HJL_LMA2_final_HDR.lz4" "F:/bakery/HJL_LMA2_final_HDR.lz4" 256 0
+Running seamfixer "F:/bakery" "2" "HJL_LMA2_final_HDR.lz4"
+Total cache size 267221224
+Total cache size after purge 267221224
--- a/bakery_times.log
+++ b/bakery_times.log
@@ -5,3 +5,4 @@
 05/16/2024 10:18 | HJL | 0h 0m 16s
 05/16/2024 10:27 | HJL | 0h 0m 31s
 05/16/2024 10:38 | HJL | 0h 0m 35s
+05/16/2024 14:17 | HJL | 0h 0m 22s