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

Jackie Li HW 4 Stylised Shaders Submission #31

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d821713
Port over everything from Lab.
sagescherrytree Nov 3, 2023
e50b362
Made a textured shader, I suppose.
sagescherrytree Nov 4, 2023
a8a53e8
Tried to get the normal, depth, and fullscreen render bug fixed.
sagescherrytree Nov 5, 2023
f8cb364
Modified Render Feature
sagescherrytree Nov 5, 2023
200eac7
Update, got some textured shadow shader + grass + special surface sha…
sagescherrytree Nov 6, 2023
c9210ff
I added a post process shader?! Accidentally?
sagescherrytree Nov 6, 2023
92e3884
I GOT THE OUTLINES TO WORK!
sagescherrytree Nov 7, 2023
651a1cc
Watercolour Shader.
sagescherrytree Nov 7, 2023
de8c95d
Final Update before Assignment Commit.
sagescherrytree Nov 7, 2023
e09987b
Uploaded Photos and Video.
sagescherrytree Nov 7, 2023
8578524
Added Shader Code Screenshots.
sagescherrytree Nov 7, 2023
105c630
Readme update test.
sagescherrytree Nov 7, 2023
fe955d4
Please show up photos?
sagescherrytree Nov 7, 2023
9ded3f7
please SHOW up PhoToS?!
sagescherrytree Nov 7, 2023
f25001c
Concept art section updated.
sagescherrytree Nov 7, 2023
86d6bf9
Fixed slight error on concept art readme.
sagescherrytree Nov 7, 2023
8904cba
Please show up FINAL CONCEPT ART!
sagescherrytree Nov 7, 2023
5ace1a7
Updated Additional Lighting README.md.
sagescherrytree Nov 8, 2023
15157ce
Henlo.
sagescherrytree Nov 8, 2023
1b9afeb
Add MP4 test.
sagescherrytree Nov 8, 2023
e2ece94
Test 2?
sagescherrytree Nov 8, 2023
53e6ac8
Test Successful?
sagescherrytree Nov 8, 2023
456fb3c
Added more to Multidirectional Light and Special Shader.
sagescherrytree Nov 8, 2023
ac4f6ba
Added another shader photo.
sagescherrytree Nov 8, 2023
58421f0
Merge branch 'main' of https://github.com/sagescherrytree/hw04-styliz…
sagescherrytree Nov 8, 2023
ab58829
Added InteractiveDemo video.
sagescherrytree Nov 8, 2023
d938f5b
Replaced InteractivityDemo with smaller file size..
sagescherrytree Nov 8, 2023
bf301a3
replaced again...
sagescherrytree Nov 8, 2023
717b09a
Push aranara Breakdown.
sagescherrytree Nov 8, 2023
d5cd640
Update README.md
sagescherrytree Nov 8, 2023
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
61 changes: 61 additions & 0 deletions Assets/Materials/Another Test.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Another Test
m_Shader: {fileID: -6465566751694194690, guid: 6ee82e8c327a9b841a5e3fb3bac99cf4,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- REQUIRE_DEPTH_TEXTURE
m_InvalidKeywords:
-
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalsBuffer:
m_Texture: {fileID: 8400000, guid: a348fe2d588e6ba48b8e31d4143cb7ba, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- REQUIRE_DEPTH_TEXTURE: 1
- _Depth_Strength: -4.45
- _Depth_Thickness: 15.89
- _Depth_Thickness_1: 3.9
- _Depth_Threshold: 12
- _Noise_Intensity: 1
- _Noise_Scale: 1
- _Thickness: 0.001
m_Colors:
- _Colour: {r: 0.9423097, g: 1, b: 0.5613208, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/Another Test.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 78 additions & 0 deletions Assets/Materials/Aranara2.0.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Aranara2.0
m_Shader: {fileID: -6465566751694194690, guid: 9cfe7357b181acb4187cdc8c418262dd,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- ADDITIONAL_LIGHT_CALCULATE_SHADOWS
- MAIN_LIGHT_CALCULATE_SHADOWS
- _ADDITIONAL_LIGHTS
- _MAIN_LIGHT_SHADOWS_CASCADE
- _SHADOWS_SOFT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _SampleTexture2D_27d9ff32006740b3a25810c52750e08a_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: dfa6863bda0ffd14d897d43f82b4f94a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- ADDITIONAL_LIGHT_CALCULATE_SHADOWS: 1
- MAIN_LIGHT_CALCULATE_SHADOWS: 1
- _ADDITIONAL_LIGHTS: 1
- _MAIN_LIGHT_SHADOWS_CASCADE: 1
- _QueueControl: 0
- _QueueOffset: 0
- _SHADOWS_SOFT: 1
- _Threshold_1: 0.595
- _Threshold_2: 0.991
m_Colors:
- _Highlight: {r: 1, g: 0.9490196, b: 0.80784315, a: 0}
- _Midtones: {r: 1, g: 0.9137255, b: 0.5764706, a: 0}
- _Ramped_Diffuse_Values: {r: 0.1, g: 0.2, b: 1, a: 0}
- _Shadow: {r: 1, g: 0.72156864, b: 0.0627451, a: 0}
- _Thresholds: {r: 0.4, g: 0.6, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &4914390540758920133
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
8 changes: 8 additions & 0 deletions Assets/Materials/Aranara2.0.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 78 additions & 0 deletions Assets/Materials/Aranara2.1.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Aranara2.1
m_Shader: {fileID: -6465566751694194690, guid: 9cfe7357b181acb4187cdc8c418262dd,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- ADDITIONAL_LIGHT_CALCULATE_SHADOWS
- MAIN_LIGHT_CALCULATE_SHADOWS
- _ADDITIONAL_LIGHTS
- _MAIN_LIGHT_SHADOWS_CASCADE
- _SHADOWS_SOFT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _SampleTexture2D_27d9ff32006740b3a25810c52750e08a_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: dfa6863bda0ffd14d897d43f82b4f94a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- ADDITIONAL_LIGHT_CALCULATE_SHADOWS: 1
- MAIN_LIGHT_CALCULATE_SHADOWS: 1
- _ADDITIONAL_LIGHTS: 1
- _MAIN_LIGHT_SHADOWS_CASCADE: 1
- _QueueControl: 0
- _QueueOffset: 0
- _SHADOWS_SOFT: 1
- _Threshold_1: 0.062
- _Threshold_2: 0.444
m_Colors:
- _Highlight: {r: 0.3882353, g: 0.6392157, b: 0.105882354, a: 0}
- _Midtones: {r: 0.2784314, g: 0.49019608, b: 0.043137256, a: 0}
- _Ramped_Diffuse_Values: {r: 0.1, g: 0.2, b: 1, a: 0}
- _Shadow: {r: 0.13333334, g: 0.25490198, b: 0.07450981, a: 0}
- _Thresholds: {r: 0.4, g: 0.6, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &4914390540758920133
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
8 changes: 8 additions & 0 deletions Assets/Materials/Aranara2.1.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions Assets/Materials/Grass Mat.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3241922004071656522
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Grass Mat
m_Shader: {fileID: -6465566751694194690, guid: bf8d9df2a5aeaad43810401e446e9460,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _QueueControl: 0
- _QueueOffset: 0
m_Colors:
- _Colour_1: {r: 0.27284288, g: 0.41509426, b: 0, a: 0}
- _Colour_2: {r: 0.7854518, g: 1, b: 0.29716977, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/Grass Mat.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions Assets/Materials/Normal Copy Material.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Normal Copy Material
m_Shader: {fileID: 4800000, guid: cc22dca0c7ea93b468ff810ba472fe57, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats: []
m_Colors: []
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/Normal Copy Material.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading