Update LWGUI And Add PBRLightMap

DearIcer · Nov 21, 2022 · 2ccab8b · 2ccab8b
1 parent 3029b12
commit 2ccab8b
Show file tree

Hide file tree

Showing 28 changed files with 2,354 additions and 639 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ Packages/[email protected]
 ProjectSettings/ProjectVersion.txt
 UserSettings/Layouts
 UserSettings
+Assets/ProVersion
+Assets/ProVersion.meta
diff --git a/Assets/Res_Example/Shader/NPR Standard/FERNNPRExample.shader b/Assets/Res_Example/Shader/NPR Standard/FERNNPRExample.shader
@@ -69,8 +69,6 @@ Shader "NPRRenderPipeline/URP/FERNNPRExample"
  [Sub(Outline._OUTLINE)] _OutlineWidth ("Outline Width", Range(0, 10)) = 1
 
  // RenderSetting 
- [Space()]
- [Space()]
  [Title(_, RenderSetting)]
  [Surface(_)] _Surface("Surface Type", Float) = 0.0
  [Enum(UnityEngine.Rendering.CullMode)] _Cull("Cull Mode", Float) = 2.0

diff --git a/Assets/Res_Example/VRM/VRMTest.vrm1.Materials/N00_000_00_Body_00_SKIN (Instance).mat b/Assets/Res_Example/VRM/VRMTest.vrm1.Materials/N00_000_00_Body_00_SKIN (Instance).mat
@@ -31,6 +31,10 @@ Material:
  m_SavedProperties:
  serializedVersion: 3
  m_TexEnvs:
+ - _AnisoShiftMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _BaseMap:
  m_Texture: {fileID: 2800000, guid: 2d8b38b4aa437594fb59b64649ace964, type: 3}
  m_Scale: {x: 1, y: 1}
@@ -78,6 +82,15 @@ Material:
  m_Ints: []
  m_Floats:
  - _AlphaMode: 1
+ - _AnisoShiftScale: 10
+ - _AnisoSpread1: 0
+ - _AnisoSpread2: 0
+ - _AnsioSecondarySpeularExponent: 1
+ - _AnsioSecondarySpeularShift: 1
+ - _AnsioSecondarySpeularStrength: 1
+ - _AnsioSpeularExponent: 1
+ - _AnsioSpeularShift: 1
+ - _AnsioSpeularStrength: 1
  - _BlendMode: 1
  - _BumpMapKeyword: 1
  - _BumpScale: 1
@@ -141,6 +154,8 @@ Material:
  - _groupRim: 1
  - _groupSpecular: 1
  m_Colors:
+ - _AnisoSecondarySpecularColor: {r: 0, g: 0, b: 0, a: 1}
+ - _AnisoSpecularColor: {r: 0, g: 0, b: 0, a: 1}
  - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
  - _Color: {r: 1, g: 1, b: 1, a: 1}
  - _DarkColor: {r: 0.9528302, g: 0.8419663, b: 0.8419663, a: 1}

diff --git a/Assets/Res_Example/VRM/VRMTest.vrm1.Materials/N00_000_Hair_00_HAIR_03 (Instance).mat b/Assets/Res_Example/VRM/VRMTest.vrm1.Materials/N00_000_Hair_00_HAIR_03 (Instance).mat
@@ -12,6 +12,7 @@ Material:
  m_ValidKeywords:
  - _ALPHATEST_ON
  - _ANISOTROPY
+ - _CELLSHADING
  m_InvalidKeywords:
  - _MTOON_EMISSIVEMAP
  - _MTOON_RIMMAP