fix merge

2020-10-01 16:58:26 +05:00
parent 26da72bad6
commit 7853fa504a
62 changed files with 6980 additions and 5833 deletions
@@ -2,6 +2,6 @@
 	"BuildId": "14379109",
 	"Modules": 
 	{
-		"ShipPresentation": "UE4Editor-ShipPresentation-0026.dll"
+		"ShipPresentation": "UE4Editor-ShipPresentation.dll"
 	}
 }
@@ -125,6 +125,6 @@ VisualizeCalibrationCustomMaterialPath=None
 VisualizeCalibrationGrayscaleMaterialPath=None

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/maps/NewMap.NewMap
+EditorStartupMap=/Game/maps/black.black
 GameDefaultMap=/Game/maps/NewMap.NewMap

@@ -1,6 +1,6 @@
 [/Script/EngineSettings.GameMapsSettings]
 GameInstanceClass=/Script/Engine.GameInstance
-EditorStartupMap=/Game/maps/NewMap.NewMap
+EditorStartupMap=/Game/maps/black.black
 GameDefaultMap=/Game/maps/NewMap.NewMap
 ServerDefaultMap=/Engine/Maps/Entry
 GlobalDefaultGameMode=/Script/Engine.GameModeBase
@@ -0,0 +1,249 @@
+[DevOptions.StaticLighting]
+bAllowMultiThreadedStaticLighting=True
+ViewSingleBounceNumber=-1
+bUseBilinearFilterLightmaps=True
+bCompressLightmaps=True
+bUseConservativeTexelRasterization=True
+bAccountForTexelSize=True
+bUseMaxWeight=True
+MaxTriangleLightingSamples=8
+MaxTriangleIrradiancePhotonCacheSamples=4
+bAllow64bitProcess=True
+DefaultStaticMeshLightingRes=32
+bAllowCropping=False
+bGarbageCollectAfterExport=True
+bRebuildDirtyGeometryForLighting=True
+bUseEmbree=true
+bVerifyEmbree=false
+bUseEmbreePacketTracing=false
+bUseFastVoxelization=false
+bUseEmbreeInstancing=false
+bUseFilteredCubemapForSkylight=true
+MappingSurfaceCacheDownsampleFactor=2
+
+[DevOptions.StaticLightingSceneConstants]
+StaticLightingLevelScale=1
+VisibilityRayOffsetDistance=.1
+VisibilityNormalOffsetDistance=3
+VisibilityNormalOffsetSampleRadiusScale=.1
+VisibilityTangentOffsetSampleRadiusScale=.8
+SmallestTexelRadius=.1
+LightGridSize=100
+AutomaticImportanceVolumeExpandBy=500
+MinimumImportanceVolumeExtentWithoutWarning=10000.0
+
+[DevOptions.StaticLightingMaterial]
+bUseDebugMaterial=False
+ShowMaterialAttribute=None
+EmissiveSampleSize=128
+DiffuseSampleSize=128
+SpecularSampleSize=128
+TransmissionSampleSize=256
+NormalSampleSize=256
+TerrainSampleScalar=4
+DebugDiffuse=(R=0.500000,G=0.500000,B=0.500000)
+EnvironmentColor=(R=0.00000,G=0.00000,B=0.00000)
+
+[DevOptions.MeshAreaLights]
+bVisualizeMeshAreaLightPrimitives=False
+EmissiveIntensityThreshold=.01
+MeshAreaLightGridSize=100
+MeshAreaLightSimplifyNormalAngleThreshold=25
+MeshAreaLightSimplifyCornerDistanceThreshold=.5
+MeshAreaLightSimplifyMeshBoundingRadiusFractionThreshold=.1
+MeshAreaLightGeneratedDynamicLightSurfaceOffset=30
+
+[DevOptions.PrecomputedDynamicObjectLighting]
+bVisualizeVolumeLightSamples=False
+bVisualizeVolumeLightInterpolation=False
+NumHemisphereSamplesScale=2
+SurfaceLightSampleSpacing=300
+FirstSurfaceSampleLayerHeight=50
+SurfaceSampleLayerHeightSpacing=250
+NumSurfaceSampleLayers=2
+DetailVolumeSampleSpacing=300
+VolumeLightSampleSpacing=3000
+MaxVolumeSamples=250000
+bUseMaxSurfaceSampleNum=True
+MaxSurfaceLightSamples=500000
+
+[DevOptions.VolumetricLightmaps]
+BrickSize=4
+MaxRefinementLevels=3
+VoxelizationCellExpansionForSurfaceGeometry=.1
+VoxelizationCellExpansionForVolumeGeometry=.25
+VoxelizationCellExpansionForLights=.1
+TargetNumVolumetricLightmapTasks=800
+MinBrickError=.01
+SurfaceLightmapMinTexelsPerVoxelAxis=1.0
+bCullBricksBelowLandscape=true
+LightBrightnessSubdivideThreshold=.3
+
+[DevOptions.PrecomputedVisibility]
+bVisualizePrecomputedVisibility=False
+bCompressVisibilityData=True
+bPlaceCellsOnOpaqueOnly=True
+NumCellDistributionBuckets=800
+CellRenderingBucketSize=5
+NumCellRenderingBuckets=5
+PlayAreaHeight=220
+MeshBoundsScale=1.2
+VisibilitySpreadingIterations=1
+MinMeshSamples=14
+MaxMeshSamples=40
+NumCellSamples=24
+NumImportanceSamples=40
+
+[DevOptions.PrecomputedVisibilityModeratelyAggressive]
+MeshBoundsScale=1
+VisibilitySpreadingIterations=1
+
+[DevOptions.PrecomputedVisibilityMostAggressive]
+MeshBoundsScale=1
+VisibilitySpreadingIterations=0
+
+[DevOptions.VolumeDistanceField]
+VoxelSize=75
+VolumeMaxDistance=900
+NumVoxelDistanceSamples=800
+MaxVoxels=3992160
+
+[DevOptions.StaticShadows]
+bUseZeroAreaLightmapSpaceFilteredLights=False
+NumShadowRays=8
+NumPenumbraShadowRays=8
+NumBounceShadowRays=1
+bFilterShadowFactor=True
+ShadowFactorGradientTolerance=0.5
+bAllowSignedDistanceFieldShadows=True
+MaxTransitionDistanceWorldSpace=50
+ApproximateHighResTexelsPerMaxTransitionDistance=50
+MinDistanceFieldUpsampleFactor=3
+MinUnoccludedFraction=.0005
+StaticShadowDepthMapTransitionSampleDistanceX=100
+StaticShadowDepthMapTransitionSampleDistanceY=100
+StaticShadowDepthMapSuperSampleFactor=2
+StaticShadowDepthMapMaxSamples=4194304
+
+[DevOptions.ImportanceTracing]
+bUseStratifiedSampling=True
+NumHemisphereSamples=16
+MaxHemisphereRayAngle=89
+NumAdaptiveRefinementLevels=2
+AdaptiveBrightnessThreshold=1
+AdaptiveFirstBouncePhotonConeAngle=4
+AdaptiveSkyVarianceThreshold=.5
+bUseRadiositySolverForSkylightMultibounce=True
+bCacheFinalGatherHitPointsForRadiosity=False
+bUseRadiositySolverForLightMultibounce=False
+
+[DevOptions.PhotonMapping]
+bUsePhotonMapping=True
+bUseFinalGathering=True
+bUsePhotonDirectLightingInFinalGather=False
+bVisualizeCachedApproximateDirectLighting=False
+bUseIrradiancePhotons=True
+bCacheIrradiancePhotonsOnSurfaces=True
+bVisualizePhotonPaths=False
+bVisualizePhotonGathers=True
+bVisualizePhotonImportanceSamples=False
+bVisualizeIrradiancePhotonCalculation=False
+bEmitPhotonsOutsideImportanceVolume=False
+ConeFilterConstant=1
+NumIrradianceCalculationPhotons=400
+FinalGatherImportanceSampleFraction=.6
+FinalGatherImportanceSampleConeAngle=10
+IndirectPhotonEmitDiskRadius=200
+IndirectPhotonEmitConeAngle=30
+MaxImportancePhotonSearchDistance=2000
+MinImportancePhotonSearchDistance=20
+NumImportanceSearchPhotons=10
+OutsideImportanceVolumeDensityScale=.0005
+DirectPhotonDensity=350
+DirectIrradiancePhotonDensity=350
+DirectPhotonSearchDistance=200
+IndirectPhotonPathDensity=5
+IndirectPhotonDensity=600
+IndirectIrradiancePhotonDensity=300
+IndirectPhotonSearchDistance=200
+PhotonSearchAngleThreshold=.5
+IrradiancePhotonSearchConeAngle=10
+bUsePhotonSegmentsForVolumeLighting=true
+PhotonSegmentMaxLength=1000
+GeneratePhotonSegmentChance=.01
+
+[DevOptions.IrradianceCache]
+bAllowIrradianceCaching=True
+bUseIrradianceGradients=False
+bShowGradientsOnly=False
+bVisualizeIrradianceSamples=True
+RecordRadiusScale=.8
+InterpolationMaxAngle=20
+PointBehindRecordMaxAngle=10
+DistanceSmoothFactor=4
+AngleSmoothFactor=4
+SkyOcclusionSmoothnessReduction=.5
+MaxRecordRadius=1024
+CacheTaskSize=64
+InterpolateTaskSize=64
+
+[DevOptions.StaticLightingMediumQuality]
+NumShadowRaysScale=2
+NumPenumbraShadowRaysScale=4
+ApproximateHighResTexelsPerMaxTransitionDistanceScale=3
+MinDistanceFieldUpsampleFactor=3
+NumHemisphereSamplesScale=2
+NumImportanceSearchPhotonsScale=1
+NumDirectPhotonsScale=2
+DirectPhotonSearchDistanceScale=.5
+NumIndirectPhotonPathsScale=1
+NumIndirectPhotonsScale=2
+NumIndirectIrradiancePhotonsScale=2
+RecordRadiusScaleScale=.75
+InterpolationMaxAngleScale=1
+IrradianceCacheSmoothFactor=.75
+NumAdaptiveRefinementLevels=3
+AdaptiveBrightnessThresholdScale=.5
+AdaptiveFirstBouncePhotonConeAngleScale=1
+AdaptiveSkyVarianceThresholdScale=1
+
+[DevOptions.StaticLightingHighQuality]
+NumShadowRaysScale=4
+NumPenumbraShadowRaysScale=8
+ApproximateHighResTexelsPerMaxTransitionDistanceScale=6
+MinDistanceFieldUpsampleFactor=5
+NumHemisphereSamplesScale=4
+NumImportanceSearchPhotonsScale=2
+NumDirectPhotonsScale=2
+DirectPhotonSearchDistanceScale=.5
+NumIndirectPhotonPathsScale=2
+NumIndirectPhotonsScale=4
+NumIndirectIrradiancePhotonsScale=2
+RecordRadiusScaleScale=.75
+InterpolationMaxAngleScale=.75
+IrradianceCacheSmoothFactor=.75
+NumAdaptiveRefinementLevels=3
+AdaptiveBrightnessThresholdScale=.25
+AdaptiveFirstBouncePhotonConeAngleScale=2
+AdaptiveSkyVarianceThresholdScale=.5
+
+[DevOptions.StaticLightingProductionQuality]
+NumShadowRaysScale=8
+NumPenumbraShadowRaysScale=32
+ApproximateHighResTexelsPerMaxTransitionDistanceScale=6
+MinDistanceFieldUpsampleFactor=5
+NumHemisphereSamplesScale=8
+NumImportanceSearchPhotonsScale=3
+NumDirectPhotonsScale=4
+DirectPhotonSearchDistanceScale=.5
+NumIndirectPhotonPathsScale=2
+NumIndirectPhotonsScale=8
+NumIndirectIrradiancePhotonsScale=2
+RecordRadiusScaleScale=.5625
+InterpolationMaxAngleScale=.75
+IrradianceCacheSmoothFactor=.75
+NumAdaptiveRefinementLevels=3
+AdaptiveBrightnessThresholdScale=.25
+AdaptiveFirstBouncePhotonConeAngleScale=2.5
+AdaptiveSkyVarianceThresholdScale=.5
+
@@ -0,0 +1,5 @@
+[CrashReportClient]
+bHideLogFilesOption=false
+bIsAllowedToCloseWithoutSending=true
+CrashConfigPurgeDays=2
+
@@ -130,11 +130,11 @@ CurrentRotGridSize=0
 CurrentRotGridMode=GridMode_DivisionsOf360

 [EditorStartup]
-LastLevel=/Game/maps/NewMap
+LastLevel=/Game/maps/black

 [ModuleFileTracking]
-ShipPresentation.TimeStamp=2020.09.30-14.30.01
-ShipPresentation.LastCompileMethod=Runtime
+ShipPresentation.TimeStamp=2020.10.01-11.44.39
+ShipPresentation.LastCompileMethod=External
 PakFile.TimeStamp=2020.09.28-09.28.14
 PakFile.LastCompileMethod=Unknown
 RSA.TimeStamp=2020.09.28-09.28.19
@@ -993,7 +993,7 @@ ContentBrowserTab1.ActiveTypeFilters=
 ContentBrowserTab1.EnabledTypeFilters=
 ContentBrowserTab1.ActiveFrontendFilters=
 ContentBrowserTab1.EnabledFrontendFilters=
-ContentBrowserTab1.SelectedPaths=/Game/blueprints/ship
+ContentBrowserTab1.SelectedPaths=/Game/meshes
 ContentBrowserTab1.Favorites.SelectedPaths=
 FavoritePaths=
 ContentBrowserTab1.CollectionsExpanded=True
@@ -1022,23 +1022,28 @@ Level=../../../../../UE4Projects/ShipPresentation/ShipPresentation/Content/maps
 Project=D:/UE4/UE_4.26/

 [MRU]
-MRUItem0=/Game/maps/NewMap
+MRUItem0=/Game/maps/black
+MRUItem1=/Game/maps/ship
+MRUItem2=/Game/maps/NewMap

 [ContentBrowserRecent]
-MRUItem0=/Game/blueprints/ship/BP_Ship
-MRUItem1=/Game/meshes/ship/SM_Ship_Screw
-MRUItem2=/Game/blueprints/BP_Ship
-MRUItem3=/Game/meshes/ship/SM_Ship_SM_Tower
-MRUItem4=/Game/meshes/ship/SM_Ship_SM_TowersGun
-MRUItem5=/Game/meshes/ship/SM_Ship_SM_MachinegunsGun
-MRUItem6=/Game/meshes/ship/SM_Ship_SM_Machinegun
-MRUItem7=/Game/materials/water/water_Inst
-MRUItem8=/Game/materials/water/water
-MRUItem9=/Game/meshes/ship/SM_Ship_SM_Radar
-MRUItem10=/Game/meshes/ship/SM_Ship_SM_TrackerHead
-MRUItem11=/Game/meshes/ship/SM_Ship_SM_TrackerBody
-MRUItem12=/Game/meshes/ship/SM_Ship_SM_Ship
-MRUItem13=/Game/blueprints/NewBlueprint
+MRUItem0=/Game/maps/black
+MRUItem1=/Game/meshes/ship/SM_Ship_Machinegun
+MRUItem2=/Game/maps/NewMap
+MRUItem3=/Game/meshes/ship/SM_Ship_SM_MachinegunsGun
+MRUItem4=/Game/blueprints/ship/BP_Ship
+MRUItem5=/Game/meshes/ship/SM_Ship_Screw
+MRUItem6=/Game/blueprints/BP_Ship
+MRUItem7=/Game/meshes/ship/SM_Ship_SM_Tower
+MRUItem8=/Game/meshes/ship/SM_Ship_SM_TowersGun
+MRUItem9=/Game/meshes/ship/SM_Ship_SM_Machinegun
+MRUItem10=/Game/materials/water/water_Inst
+MRUItem11=/Game/materials/water/water
+MRUItem12=/Game/meshes/ship/SM_Ship_SM_Radar
+MRUItem13=/Game/meshes/ship/SM_Ship_SM_TrackerHead
+MRUItem14=/Game/meshes/ship/SM_Ship_SM_TrackerBody
+MRUItem15=/Game/meshes/ship/SM_Ship_SM_Ship
+MRUItem16=/Game/blueprints/NewBlueprint

 [DetailCategories]
 NewBlueprint_C.Tick=True
@@ -1438,6 +1443,8 @@ BP_Ship_C.Default=True
 /Game/meshes/ship/SM_Ship_Tower.SM_Ship_Tower=1
 /Game/blueprints/ship/BP_Ship.BP_Ship=1
 /Game/meshes/ship/SM_Ship_Screw.SM_Ship_Screw=1
+/Game/meshes/ship/SM_Ship_SM_MachinegunsGun.SM_Ship_SM_MachinegunsGun=1
+/Game/meshes/ship/SM_Ship_Machinegun.SM_Ship_Machinegun=1

 [/Script/BlueprintGraph.BlueprintEditorSettings]
 bDrawMidpointArrowsInBlueprints=False
@@ -1479,6 +1486,7 @@ NodeTemplateCacheCapMB=20.000000
 CryptoKeysSettings=True
 GeneralProjectSettings=True
 GameMapsSettings=True
+GameplayTagsSettings=True

 [FBX_Import_UI_Option_FbxImportUI]
 bOverrideFullName=True
@@ -1590,7 +1598,7 @@ bForceFrontXAxis=False
 bConvertSceneUnit=False

 [MessageLog]
-LastLogListing=FBXImport
+LastLogListing=LightingResults

 [PlacementMode]
 RecentlyPlaced=/Game/blueprints/ship/BP_Ship.BP_Ship;
@@ -1675,3 +1683,8 @@ bShowGrid=False
 bDrawGrid=False
 PrimType=1

+[LightingBuildOptions]
+OnlyBuildSelected=False
+OnlyBuildSelectedLevels=False
+OnlyBuildVisibility=False
+