浏览代码

Merge branch 'master' into feature/new-clouds

# Conflicts:
#	Assets/Shaders/Vegetation/Vegetation.shadergraph
#	Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt
/feature-new-clouds
Andrem 3 年前
当前提交
5eb68dc3
共有 13 个文件被更改,包括 776 次插入503 次删除
  1. 2
      Assets/Scripts/Editor/LodLightmapCopy.cs
  2. 6
      Assets/Scripts/GameSystem/DefaultVolume.cs
  3. 2
      Assets/Scripts/GameSystem/RaceManager.cs
  4. 4
      Assets/Scripts/GameSystem/AppSettings.cs
  5. 4
      Assets/Scripts/Utility/Utility.cs
  6. 553
      Assets/Shaders/Vegetation/Vegetation.shadergraph
  7. 624
      Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
  8. 4
      Packages/com.verasl.water-system/Scripts/GerstnerWavesJobs.cs
  9. 4
      Packages/com.verasl.water-system/Scripts/Rendering/PlanarReflections.cs
  10. 18
      Packages/manifest.json
  11. 54
      Packages/packages-lock.json
  12. 4
      ProjectSettings/ProjectVersion.txt
  13. 0
      .gitmodules

2
Assets/Scripts/Editor/LodLightmapCopy.cs


private static void Execute()
{
if(UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if(Debug.isDebugBuild)
Debug.Log("Baking LOD Lightmap values");
var lodGroups= Object.FindObjectsOfType<LODGroup>();
foreach (var lodGroup in lodGroups)

6
Assets/Scripts/GameSystem/DefaultVolume.cs


if (Instance != null && Instance != this)
{
if (UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if (Debug.isDebugBuild)
Debug.Log($"Extra Volume Manager cleaned up. GUID:{gameObject.GetInstanceID()}");
StopAllCoroutines();
Utility.SafeDestroy(gameObject);

Instance = this;
gameObject.name = "[DefaultVolume]";
if (UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if (Debug.isDebugBuild)
Debug.Log($"Default Volume is {gameObject.GetInstanceID()}");
Utility.QualityLevelChange += UpdateVolume;
UpdateVolume(0, Utility.GetTrueQualityLevel()); // First time set

volQualityComponent.sharedProfile = vol.OperationHandle.Result as VolumeProfile;
_loading = false;
if (UniversalRenderPipeline.asset.debugLevel == PipelineDebugLevel.Disabled) yield break;
if (!Debug.isDebugBuild) yield break;
Debug.Log(message: "Updated volumes:\n" +
$" Base Volume : {(volBaseComponent.sharedProfile ? volBaseComponent.sharedProfile.name : "none")}\n" +
$" Quality Volume : {(volQualityComponent.sharedProfile ? volQualityComponent.sharedProfile.name : "none")}\n" +

2
Assets/Scripts/GameSystem/RaceManager.cs


private void Awake()
{
if(UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if(Debug.isDebugBuild)
Debug.Log("RaceManager Loaded");
Instance = this;
}

4
Assets/Scripts/GameSystem/AppSettings.cs


// Use this for initialization
private void Awake()
{
if(UniversalRenderPipeline.asset.debugLevel == PipelineDebugLevel.Profiling)
if(Debug.isDebugBuild)
Debug.Log("AppManager initializing");
Initialize();
CmdArgs();

};
var renderScale = Mathf.Clamp(res / Screen.width, 0.1f, 1.0f);
if(UniversalRenderPipeline.asset.debugLevel == PipelineDebugLevel.Profiling)
if(Debug.isDebugBuild)
Debug.Log($"Settings render scale to {renderScale * 100}% based on {maxRenderSize.ToString()}");
maxScale = renderScale;

4
Assets/Scripts/Utility/Utility.cs


var curLevel = QualitySettings.GetQualityLevel();
if (lastQualityLevel == curLevel) return;
if(UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if(Debug.isDebugBuild)
Debug.Log($"Quality level changed:{lastQualityLevel} to {curLevel}");
var realIndex = GetTrueQualityLevel(curLevel);
QualityLevelChange?.Invoke(curLevel, realIndex);

static UtilityScheduler()
{
// setup the things
if(UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if(Debug.isDebugBuild)
Debug.Log("Setting up some utilities");
EditorApplication.update += Utility.CheckQualityLevel;
}

553
Assets/Shaders/Vegetation/Vegetation.shadergraph
文件差异内容过多而无法显示
查看文件

624
Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
文件差异内容过多而无法显示
查看文件

4
Packages/com.verasl.water-system/Scripts/GerstnerWavesJobs.cs


public static void Init()
{
if(UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if(Debug.isDebugBuild)
Debug.Log("Initializing Gerstner Waves Jobs");
//Wave data
_waveCount = Water.Instance._waves.Length;

public static void Cleanup()
{
if(UniversalRenderPipeline.asset.debugLevel != PipelineDebugLevel.Disabled)
if(Debug.isDebugBuild)
Debug.Log("Cleaning up Gerstner Wave Jobs");
_waterHeightHandle.Complete();

4
Packages/com.verasl.water-system/Scripts/Rendering/PlanarReflections.cs


if (_reflectionTexture == null)
{
var res = ReflectionResolution(cam, UniversalRenderPipeline.asset.renderScale);
const bool useHdr10 = true;
const RenderTextureFormat hdrFormat = useHdr10 ? RenderTextureFormat.RGB111110Float : RenderTextureFormat.DefaultHDR;
bool useHdr10 = RenderingUtils.SupportsRenderTextureFormat(RenderTextureFormat.RGB111110Float);
RenderTextureFormat hdrFormat = useHdr10 ? RenderTextureFormat.RGB111110Float : RenderTextureFormat.DefaultHDR;
_reflectionTexture = RenderTexture.GetTemporary(res.x, res.y, 16,
GraphicsFormatUtility.GetGraphicsFormat(hdrFormat, true));
}

18
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "1.16.10",
"com.unity.addressables": "1.16.19",
"com.unity.burst": "1.4.1",
"com.unity.cinemachine": "2.6.3",
"com.unity.burst": "1.4.8",
"com.unity.cinemachine": "2.6.5",
"com.unity.ide.visualstudio": "2.0.5",
"com.unity.ide.vscode": "1.2.3",
"com.unity.inputsystem": "1.1.0-preview.2",
"com.unity.inputsystem": "1.1.0-preview.3",
"com.unity.memoryprofiler": "0.2.6-preview.1",
"com.unity.render-pipelines.universal": "10.2.2",
"com.unity.textmeshpro": "3.0.3",
"com.unity.timeline": "1.4.3",
"com.unity.memoryprofiler": "0.2.9-preview.3",
"com.unity.render-pipelines.universal": "10.5.0",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"net.peeweek.gameplay-ingredients": "https://github.com/peeweek/net.peeweek.gameplay-ingredients.git",
"com.unity.modules.ai": "1.0.0",

54
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.addressables": {
"version": "1.16.10",
"version": "1.16.19",
"com.unity.scriptablebuildpipeline": "1.14.1",
"com.unity.scriptablebuildpipeline": "1.15.2",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"

"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.4.1",
"version": "1.4.8",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.cinemachine": {
"version": "2.6.3",
"version": "2.6.5",
"depth": 0,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.5",
"version": "1.0.6",
"depth": 2,
"source": "registry",
"dependencies": {},

},
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.5",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"version": "1.1.0-preview.2",
"version": "1.1.0-preview.3",
"depth": 0,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.memoryprofiler": {
"version": "0.2.6-preview.1",
"version": "0.2.9-preview.3",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.render-pipelines.core": {
"version": "10.2.2",
"version": "10.5.0",
"depth": 1,
"source": "registry",
"dependencies": {

},
"com.unity.render-pipelines.universal": {
"version": "10.2.2",
"version": "10.5.0",
"com.unity.render-pipelines.core": "10.2.2",
"com.unity.shadergraph": "10.2.2"
"com.unity.render-pipelines.core": "10.5.0",
"com.unity.shadergraph": "10.5.0"
"version": "1.14.1",
"version": "1.15.2",
"depth": 1,
"source": "registry",
"dependencies": {},

"version": "4.3.1",
"version": "4.3.2",
"depth": 2,
"source": "registry",
"dependencies": {},

"version": "10.2.2",
"version": "10.5.0",
"com.unity.render-pipelines.core": "10.2.2",
"com.unity.searcher": "4.3.1"
"com.unity.render-pipelines.core": "10.5.0",
"com.unity.searcher": "4.3.2"
"version": "1.1.19",
"version": "1.1.24",
"com.unity.ext.nunit": "1.0.5",
"com.unity.ext.nunit": "1.0.6",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},

"version": "3.0.3",
"version": "3.0.6",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.timeline": {
"version": "1.4.3",
"version": "1.4.8",
"depth": 0,
"source": "registry",
"dependencies": {

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2020.2.0f1
m_EditorVersionWithRevision: 2020.2.0f1 (3721df5a8b28)
m_EditorVersion: 2020.3.9f1
m_EditorVersionWithRevision: 2020.3.9f1 (108be757e447)

0
.gitmodules

正在加载...
取消
保存