浏览代码

Manifest back to packages

Moved texture2Darray script to editor folder
Added GPU instancing back on the vegetation material
/main
Andre McGrail 7 年前
当前提交
f485660c
共有 11 个文件被更改,包括 63 次插入53 次删除
  1. 2
      Assets/Objects/environment/Trees/Materials/Softvegetation.mat
  2. 14
      Packages/manifest.json
  3. 1
      ProjectSettings/GraphicsSettings.asset
  4. 9
      ProjectSettings/ProjectSettings.asset
  5. 8
      Assets/Scripts/Editor.meta
  6. 37
      Packages/manifest_git.json
  7. 11
      Packages/manifest_packageFolder.json
  8. 34
      Packages/manifest_package.json
  9. 0
      /Assets/Scripts/Editor/CreateTexture2DArrayAsset.cs
  10. 0
      /Assets/Scripts/Editor/CreateTexture2DArrayAsset.cs.meta

2
Assets/Objects/environment/Trees/Materials/Softvegetation.mat


m_ShaderKeywords: _ALPHATEST_ON _CORRECTNORMALS_OFF _METALLICGLOSSMAP _METALLICSPECGLOSSMAP
_NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2100
stringTagMap: {}

14
Packages/manifest.json


{
"registry": "https://staging-packages.unity.com",
"dependencies": {
"com.unity.postprocessing": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.postprocessing",
"com.unity.render-pipelines.core": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.render-pipelines.core",
"com.unity.render-pipelines.lightweight": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.render-pipelines.lightweight",
"com.unity.shadergraph": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.shadergraph",
"com.unity.ads": "2.0.8",
"com.unity.render-pipelines.lightweight": "2.0.1-preview",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",

"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",

1
ProjectSettings/GraphicsSettings.asset


- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

9
ProjectSettings/ProjectSettings.asset


m_APIs: 02000000
m_Automatic: 0
- m_BuildTarget: AndroidPlayer
m_APIs: 0b000000
m_APIs: 150000000b000000
m_Automatic: 0
- m_BuildTarget: MacStandaloneSupport
m_APIs: 10000000

openGLRequireES31: 0
openGLRequireES31AEP: 0
openGLRequireES31: 1
openGLRequireES31AEP: 1
m_TemplateCustomTags: {}
mobileMTRendering:
Android: 1

switchAllowsRuntimeAddOnContentInstall: 0
switchDataLossConfirmation: 0
switchSupportedNpadStyles: 3
switchNativeFsCacheSize: 32
switchIsHoldTypeHorizontal: 0
switchSupportedNpadCount: 8
switchSocketConfigEnabled: 0
switchTcpInitialSendBufferSize: 32
switchTcpInitialReceiveBufferSize: 64

8
Assets/Scripts/Editor.meta


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

37
Packages/manifest_git.json


{
"registry": "https://staging-packages.unity.com",
"dependencies": {
"com.unity.postprocessing": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.postprocessing",
"com.unity.render-pipelines.core": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.render-pipelines.core",
"com.unity.render-pipelines.lightweight": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.render-pipelines.lightweight",
"com.unity.shadergraph": "file:/Users/andremcgrail/Documents/UnityProjects/SRP/ScriptableRenderPipeline/Assets/com.unity.shadergraph",
"com.unity.analytics": "2.0.16",
"com.unity.cinemachine": "2.2.0-preview.4",
"com.unity.mathematics": "0.0.12-preview.8",
"com.unity.package-manager-ui": "1.9.9",
"com.unity.purchasing": "2.0.1",
"com.unity.textmeshpro": "1.2.3",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}

11
Packages/manifest_packageFolder.json


{
"registry": "https://staging-packages.unity.com",
"dependencies": {
"com.unity.cinemachine": "2.1.12",
"com.unity.mathematics": "0.0.12-preview.2",
"com.unity.postprocessing": "file:/PostProcessing",
"com.unity.shadergraph": "file:/com.unity.shadergraph",
"com.unity.render-pipelines.core": "file:/Core",
"com.unity.render-pipelines.lightweight": "file:/LightweightPipeline"
}
}

34
Packages/manifest_package.json


{
"registry": "https://staging-packages.unity.com",
"dependencies": {
"com.unity.render-pipelines.lightweight": "2.0.0-preview",
"com.unity.analytics": "2.0.16",
"com.unity.cinemachine": "2.2.0-preview.4",
"com.unity.mathematics": "0.0.12-preview.8",
"com.unity.package-manager-ui": "1.9.9",
"com.unity.purchasing": "2.0.1",
"com.unity.textmeshpro": "1.2.3",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}

/Assets/Scripts/CreateTexture2DArrayAsset.cs → /Assets/Scripts/Editor/CreateTexture2DArrayAsset.cs

/Assets/Scripts/CreateTexture2DArrayAsset.cs.meta → /Assets/Scripts/Editor/CreateTexture2DArrayAsset.cs.meta

正在加载...
取消
保存