Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better normal map exports #534

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
dcc6e38
Convert grayscale bump maps into proper normal maps
andybak Nov 8, 2022
67bbfd6
Update materials
andybak Nov 8, 2022
1a1c27b
Merge branch 'main' into feature/normal-map-exports
andybak Nov 9, 2022
9f0ffc3
Merge branch 'main' into feature/normal-map-exports
andybak Dec 1, 2022
c6fd2b6
Merge branch 'main' into feature/normal-map-exports
andybak Dec 9, 2022
b896e73
Merge branch 'main' into feature/normal-map-exports
andybak Dec 14, 2022
a127658
Merge branch 'main' into feature/normal-map-exports
andybak Jan 21, 2023
83feed5
Merge branch 'main' into feature/normal-map-exports
andybak Feb 13, 2023
7d041ae
Merge branch 'main' into feature/normal-map-exports
andybak May 29, 2023
0bcc232
Merge branch 'main' into feature/normal-map-exports
andybak Jul 10, 2023
c687634
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 14, 2023
bd0bd22
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 18, 2023
2a2c4cb
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 19, 2023
9fe9662
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 19, 2023
48730b1
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 24, 2023
ca061dc
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 27, 2023
5301100
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 28, 2023
6dc7058
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 30, 2023
76edd4a
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jul 31, 2023
d679207
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Aug 3, 2023
4f022d7
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Aug 3, 2023
41a055c
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Aug 15, 2023
646c1a7
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Aug 30, 2023
6d4ce8e
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Sep 6, 2023
c586b40
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Sep 7, 2023
3595f99
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Sep 12, 2023
9dd8ee3
Merge branch 'main' into feature/normal-map-exports
andybak Sep 18, 2023
5c95105
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Sep 30, 2023
b2a0a73
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Oct 26, 2023
2a091f3
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Nov 23, 2023
69f0547
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Nov 29, 2023
7bfea2c
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Dec 7, 2023
a6ea1e5
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Dec 7, 2023
248515f
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Dec 20, 2023
7a933a3
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Jan 1, 2024
7a46282
Merge remote-tracking branch 'upstream/main' into feature/normal-map-…
andybak Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_InkDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_InkDoubleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3}
m_Texture: {fileID: 2800000, guid: 17e2bcfa1203af74ea0cb72e33667888, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_InkSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_InkSingleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3}
m_Texture: {fileID: 2800000, guid: 17e2bcfa1203af74ea0cb72e33667888, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_OilPaintDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_OilPaintDoubleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3}
m_Texture: {fileID: 2800000, guid: 78eb000bc8f2bef4f84b7aee5fe988c1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_OilPaintSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_OilPaintSingleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 432d5c408cd625945ab19bb572a6f8e4, type: 3}
m_Texture: {fileID: 2800000, guid: 78eb000bc8f2bef4f84b7aee5fe988c1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_PaperDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_PaperDoubleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3}
m_Texture: {fileID: 2800000, guid: 6d67c6013e98da046b93edaa3384bb51, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.16
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.14117648, g: 0.14117648, b: 0.14117648, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Materials/IntroMaterials/Intro_PaperSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Intro_PaperSingleSided
m_Shader: {fileID: 4800000, guid: d2ee93ca886e4044bb9adf0cfab5fb15, type: 3}
m_ShaderKeywords: _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +22,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 72b554b36eb21d445a97a119717a00e9, type: 3}
m_Texture: {fileID: 2800000, guid: 6d67c6013e98da046b93edaa3384bb51, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.16
Expand All @@ -77,3 +80,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.14117648, g: 0.14117648, b: 0.14117648, a: 1}
m_BuildTextureStacks: []
10 changes: 7 additions & 3 deletions Assets/Models/TutorialCube/Materials/Ink.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ink
m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_ValidKeywords: []
m_InvalidKeywords:
- _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -21,7 +23,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 599e16957e2a8a84c81e8e72b55312d7, type: 3}
m_Texture: {fileID: 2800000, guid: 17e2bcfa1203af74ea0cb72e33667888, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -56,6 +58,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.207
Expand All @@ -74,3 +77,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.4852941, g: 0.4852941, b: 0.4852941, a: 0}
m_BuildTextureStacks: []
11 changes: 8 additions & 3 deletions Assets/Resources/Brushes/Basic/DuctTape/DuctTapeDoubleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DuctTapeDoubleSided
m_Shader: {fileID: 4800000, guid: 6eca343108a01a946a82e0c33f58fda1, type: 3}
m_ShaderKeywords: SELECTION_EDGING _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- SELECTION_EDGING
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +23,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3}
m_Texture: {fileID: 2800000, guid: 1d68b19a2f329e24a8bc03eecc5823b3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +58,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.2
Expand All @@ -78,3 +82,4 @@ Material:
- _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1}
m_BuildTextureStacks: []
11 changes: 8 additions & 3 deletions Assets/Resources/Brushes/Basic/DuctTape/DuctTapeSingleSided.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DuctTapeSingleSided
m_Shader: {fileID: 4800000, guid: 6af6ca8fad7576846a6a44f5c6d7bf6b, type: 3}
m_ShaderKeywords: SELECTION_EDGING _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- SELECTION_EDGING
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +23,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 23192df5929e8904ba29a31ec2c68e46, type: 3}
m_Texture: {fileID: 2800000, guid: 1d68b19a2f329e24a8bc03eecc5823b3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand Down Expand Up @@ -55,6 +58,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.2
Expand All @@ -78,3 +82,4 @@ Material:
- _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.5372549, g: 0.5372549, b: 0.5372549, a: 1}
m_BuildTextureStacks: []
Binary file modified Assets/Resources/Brushes/Basic/DuctTape/normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading