浏览代码

Merge pull request #711 from Unity-Technologies/move-lw-to-lwrp

Move lw to lwrp
/feature-ReflectionProbeFit
GitHub 7 年前
当前提交
9bc3353a
共有 30 个文件被更改,包括 72 次插入48 次删除
  1. 3
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineAsset.cs
  2. 5
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/ShaderGUI.meta
  3. 2
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightShaderLibrary.meta
  4. 8
      ScriptableRenderPipeline/LightweightPipeline/LWRP.meta
  5. 8
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Data.meta
  6. 8
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor.meta
  7. 8
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Materials.meta
  8. 8
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders.meta
  9. 16
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightShaderIncludePaths.cs
  10. 11
      ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightShaderIncludePaths.cs.meta
  11. 9
      ScriptableRenderPipeline/LightweightPipeline/Editor.meta
  12. 9
      ScriptableRenderPipeline/LightweightPipeline/Shaders.meta
  13. 9
      ScriptableRenderPipeline/LightweightPipeline/Materials.meta
  14. 8
      ScriptableRenderPipeline/LightweightPipeline/Data.meta
  15. 8
      Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/030_Shader_RenderOrder.meta
  16. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs.meta
  17. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipelineUtils.cs.meta
  18. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightConstantBuffer.cs.meta
  19. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightConstantBuffer.cs
  20. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipelineUtils.cs
  21. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/Materials
  22. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShaderUtils.cs
  23. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShaderUtils.cs.meta
  24. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef
  25. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef.meta
  26. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/Data
  27. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor
  28. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
  29. 0
      /ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders

3
ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineAsset.cs


public class LightweightPipelineAsset : RenderPipelineAsset
{
private const int PACKAGE_MANAGER_PATH_INDEX = 1;
public static readonly string[] m_SearchPaths = {"Assets", "Packages/com.unity.render-pipelines.lightweight"};
// Default values set when a new LightweightPipeline asset is created

// There's currently an issue that prevents FindAssets from find resources withing the package folder.
if (resourceAsset == null)
{
string path = "Packages/com.unity.render-pipelines.lightweight/Data/LightweightPipelineResource.asset";
string path = m_SearchPaths[PACKAGE_MANAGER_PATH_INDEX] + "/LWRP/Data/LightweightPipelineResource.asset";
resourceAsset = AssetDatabase.LoadAssetAtPath<LightweightPipelineResource>(path);
}

5
ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/ShaderGUI.meta


fileFormatVersion: 2
guid: c8b417f54d2314549995022591d5454f
guid: e2eccaf646dce46a69c0224eb55c61a2
timeCreated: 1496821940
licenseType: Pro
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightShaderLibrary.meta


fileFormatVersion: 2
guid: 37244f7798708ba449e9893ad27f77f5
guid: 2de5b472450204ae2853db2cb6a2540a
folderAsset: yes
DefaultImporter:
externalObjects: {}

8
ScriptableRenderPipeline/LightweightPipeline/LWRP.meta


fileFormatVersion: 2
guid: 5f9e9e863e5d34a5ab12de3834516604
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
ScriptableRenderPipeline/LightweightPipeline/LWRP/Data.meta


fileFormatVersion: 2
guid: d59f1663563e245fabce035da7cecd75
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor.meta


fileFormatVersion: 2
guid: 53c20613ce8ac478dba8507359e02516
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
ScriptableRenderPipeline/LightweightPipeline/LWRP/Materials.meta


fileFormatVersion: 2
guid: 7f10efc5458aa44a2928a72c38807544
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders.meta


fileFormatVersion: 2
guid: 248877dd7078443d6b51abf21ee7d52a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

16
ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightShaderIncludePaths.cs


using System.IO;
namespace UnityEditor.Experimental.Rendering.LightweightPipeline
{
static class LightweightIncludePaths
{
[ShaderIncludePath]
public static string[] GetPaths()
{
return new[]
{
Path.GetFullPath("Packages/com.unity.render-pipelines.lightweight/LWRP/Shaders"),
};
}
}
}

11
ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightShaderIncludePaths.cs.meta


fileFormatVersion: 2
guid: cd920abe23764ecc804601f00b93c770
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
ScriptableRenderPipeline/LightweightPipeline/Editor.meta


fileFormatVersion: 2
guid: 316ed34724625cb47b31136769381b57
folderAsset: yes
timeCreated: 1484576996
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
ScriptableRenderPipeline/LightweightPipeline/Shaders.meta


fileFormatVersion: 2
guid: 81841919e91d4b24ba3a6ca4a5167bce
folderAsset: yes
timeCreated: 1490023078
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
ScriptableRenderPipeline/LightweightPipeline/Materials.meta


fileFormatVersion: 2
guid: bc5fccbcb91216745b747fafd8514a24
folderAsset: yes
timeCreated: 1496317987
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

8
ScriptableRenderPipeline/LightweightPipeline/Data.meta


fileFormatVersion: 2
guid: 96a897191a3b552429d819147e6a36a4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/030_Shader_RenderOrder.meta


fileFormatVersion: 2
guid: f78229abd339e4d49b6e0e29fd79df0c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs.meta → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs.meta

/ScriptableRenderPipeline/LightweightPipeline/LightweightPipelineUtils.cs.meta → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipelineUtils.cs.meta

/ScriptableRenderPipeline/LightweightPipeline/LightweightConstantBuffer.cs.meta → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightConstantBuffer.cs.meta

/ScriptableRenderPipeline/LightweightPipeline/LightweightConstantBuffer.cs → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightConstantBuffer.cs

/ScriptableRenderPipeline/LightweightPipeline/LightweightPipelineUtils.cs → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipelineUtils.cs

/ScriptableRenderPipeline/LightweightPipeline/Materials → /ScriptableRenderPipeline/LightweightPipeline/LWRP/Materials

/ScriptableRenderPipeline/LightweightPipeline/LightweightShaderUtils.cs → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShaderUtils.cs

/ScriptableRenderPipeline/LightweightPipeline/LightweightShaderUtils.cs.meta → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShaderUtils.cs.meta

/ScriptableRenderPipeline/LightweightPipeline/com.unity.render-pipelines.lightweight.Runtime.asmdef → /ScriptableRenderPipeline/LightweightPipeline/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef

/ScriptableRenderPipeline/LightweightPipeline/com.unity.render-pipelines.lightweight.Runtime.asmdef.meta → /ScriptableRenderPipeline/LightweightPipeline/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef.meta

/ScriptableRenderPipeline/LightweightPipeline/Data → /ScriptableRenderPipeline/LightweightPipeline/LWRP/Data

/ScriptableRenderPipeline/LightweightPipeline/Editor → /ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor

/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs → /ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs

/ScriptableRenderPipeline/LightweightPipeline/Shaders → /ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders

正在加载...
取消
保存