369c0864
Toon Shader v2 in progress
4 年前
b0af5562
Toon shader done
Needs to be broken down into pieces for modularity
4 年前
43ebc212
Art reorganisation and cleanup
4 年前
b00809ef
Toon Shader Wind effect addon ( #150 )
* Toon Shader Wind effect addon
New Sub Graph added to simulate wind based on gradient noise (over world coordinates) and applied on Object coordinates depending of the mesh vertex color (Green channel) only.
- Properties: Wind speed, Wind density, Wind strength, Wind direction (around Y axis)
Note: No update on FBX files in this PR to introduce vertex color on the existing assets. It will be done through one/multiple other PRs.
* Toon refactor
Reading back the requirement from Toon Shader add-on, it is preferred (for perf reason) to have a separated unlit shader for Toon shading with wind impact, instead of having wind graph applied to all object even if they are not sensitve to the wind.
Toon shader refactor:
- Extract each part into a separated Sub Shader
-- Shadow part: ToonShadow
-- Specular part: ToonSpecular
- Move current Toon implementation into Sub Graph: ToonColor
- Use ToonColor into Unlit shader Toon...
4 年前
a5b61b2f
Added foam + refraction + depth fare to water shader ( #139 )
* Alternative water shader proposition
* Unlit water shader and add shadow
- Unlit water shader
- Add shadow as done in Toon shader
- Add vertex displacement like done in dickmendra shader
- Change the showcase water plane to intersect with the rock close to it to see foam
* Shader clean up
* Water shader improvements
- Water effect distance cut off
- Expose light probe contribution
- Control surface shadow intensity
* Small tweaks to showcase scene
* Water shader fixes
* Showcase water
* Small tweaks
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
e92791cc
Fix Water Shader: shallow water is now refrated ( #174 )
4 年前
49995b3a
Fix refraction for object above sea level ( #177 )
4 年前
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
10258092
Merge remote-tracking branch 'tech-mkt/art-assets' into big-merge
4 年前
572e0cdd
Added Transparent support on ToonShading and Glass Shader for the lantern
4 年前
26747ac5
Merge branch 'treivize/feature/art/transparent_support' into art-assets
4 年前
e5e7acc6
Merge branch 'art-assets' into main
4 年前
245438bb
Fixed Fresnel effect done before outline and add water like movement
4 年前
f1cf3605
Simplify Toon_Fresnel shader - move Direct Specular to Lightning Model
4 年前
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
a397d578
Art: Added Detail Masks for Main Characters. Added DetailMaskTint Shader Graph.
4 年前
ec0e4787
Fixed Slime inner movement to be Object UV based and clamp direct specular
4 年前
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
6da421fe
Art: Added RandomPositionTint Shader Graph.
4 年前
05095f49
Merge remote-tracking branch 'tech-mkt/art-assets' into pr-bashing
4 年前
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
c0ba79ab
Updated direct specular contribution
4 年前
163fb9ae
Merge branch 'feature/art/slime_critter' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
b197acbf
Shaders simplification
4 年前
0a93b3d8
Shadergraph adjustments
4 年前
29fb04b5
Removed LightProbe contribution parameter from all shaders
4 年前
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
4 年前
e3d74a91
Remove Fresnel properties from ToonShading subgraph
I moved Albedo out from ToonShading and into the main shadergraph. I then created the new subgraph Albedo_Fresnel which contains the lerp operation needed for the slimes. The Albedo subgraph has been added to all toon shadergraph variants.
4 年前
8ae0f49f
Remove Albedo Influence on Specular Light Brightness
Swapping the order of the multiply and add nodes in the ToonShading subgraph to multiply albedo by diffuse light alone, then add specular highlights.
Along with this is the need ability to control specular light transparency, which can now be done using the Specular Color property's alpha channel.
4 年前
6bf8be1d
Added back recklol Dissolve effect ( #217 )
* Added recklol dissolve effect with some tweaks
* Added names to dissolve outputs
* Added a dissolve effect option in contextual menu and add alpha cutoff in Toon_Disolve
4 年前
11189097
Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets
4 年前
6b5816a6
Rebase + updated previous changes to update light if there is no baked GI.
4 年前
9d0b1667
Changed shader node flow using branchless nodes.
4 年前
e7641175
Merge branch 'art-assets' of https://github.com/daneobyrd/open-project-1 into daneobyrd-art-assets
4 年前
de401a73
Shader tweaks and reorganisation
4 年前
019c7796
Merge branch 'art-assets' into main
4 年前
d62d8e9e
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Prefabs/PrototypingTree.prefab.meta
# UOP1_Project/Assets/Samples.meta
# UOP1_Project/Assets/Samples/Polybrush.meta
# UOP1_Project/Assets/Samples/ProBuilder/4.4.0/Universal Render Pipeline Support/Material/ProBuilder Default URP.mat.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/CharController.unity.meta
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/CharController/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/Locations/Beach/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_optimized.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_opt...
4 年前
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
2c9810c9
Merge branch 'main' into interaction
4 年前
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
004c7bd1
Ground Shader WIP
Includes ground shader prototype with vertex color debug. Moves outline subgraph out of the main ToonShading subgraph. I have not included Noise Textures as I need to verify that the noise textures I used for testing are under an open-source license.
4 年前
4b89665c
Wind shader improved and painted more meshes
4 年前
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
68000753
Fixed for issue #206
4 年前
395ad4f1
Added Shader Graph solution to Outline for AA, Distance Fading and Screen Resolution independency
4 年前
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
a87f0330
Merge branch 'feature/art/outline_aa_fading_screen' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
d62c17bb
Merge branch 'bugfix/art/shader_gi_backup' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
0f397e96
Merge branch 'main' into QuestSystem
4 年前
9bcf2bfc
PR Ground Shader
Several updates to address odd visual artifacts on texture edges.
Use maximum instead of add, only one noise channel, multiply and clamp vertex color.
4 年前
aee72350
Property Name consistency
small change, added (B) to the fourth texture property's name
4 年前
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
7ece782e
Merge branch 'main' into QuestSystem
4 年前
4816946d
Created a Shader Subgraph that applies Emission to a material using CustomEmission.hlsl, and added Emission to the Toon Shadergraph
4 年前
e7bcdcfd
Fixing the merge
4 年前
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
9f80c6a1
Merge pull request #2 from Donkeylipsh/em1
Shading Model - Emission Support
4 年前
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
e5c6e42f
Emission Support - Converted custom HLSL into Shadergraph Subgraph, and added that to the Toon Shadergraph
4 年前
363ab4fa
Merge branch 'main' of https://github.com/Donkeylipsh/open-project-1 into main
4 年前
6acf65d7
Tweaked emission graph, added textures
4 年前
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
bfe7e497
New fire effect
4 年前
cb823c2b
Light tweaks and bugfix on shader
4 年前
6eaf1632
Changed gradients on toon shader
4 年前
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
4e0a85c8
Removed outline completely
4 年前
6683b1e2
Torches, shader changes
4 年前
753835bc
Night sky, sunset
4 年前
293f994f
Merge branch 'graphic-rework'
4 年前
997b50ae
Merge branch 'main' into pr/393
4 年前
7b1ed2b2
Merge branch 'main' into UI
4 年前
ee8e2b89
Wind shader tweaks
4 年前
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
5636f0a4
Improvements to vertex ground shader
Now world-space coordinates
4 年前
ebe81a73
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
4 年前
a2299fee
Water shaders, landmasses
4 年前
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
4 年前
17ad7091
Random tint shader
Added wind to random position tint shader
4 年前
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
4 年前
71481135
Shader and lighting tweaks
4 年前
53d9fe16
Scene work
4 年前
8167037b
Worldbuilding
4 年前
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
1c06f55d
Added fog to shaders
4 年前
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
56d5c554
Tweaks to glow shader
Fresnel influence is now controllable
4 年前
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
a156875a
Merge remote-tracking branch 'origin/main' into main
4 年前
81c9fb97
Graphic work (mostly Cave)
3 年前
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
4 年前
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
GitHub
treivize
kgc00
andytouch
Dane Byrd
Jan Urbanec
Dan Young
Amel
Chema Damak
uChema
vanoverc
Yohann Puyhaubert
Amel Negra