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

Update 1.5.0 #1

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
77ff264
Update 1.4.0
starstormhun Dec 1, 2023
95d6c6f
Update .gitignore
starstormhun Dec 1, 2023
43e0461
Ignore meta
starstormhun Dec 1, 2023
5399b61
Update 1.4.1
starstormhun Dec 2, 2023
bf5ce4a
v1.4.2
starstormhun Dec 8, 2023
585f13f
Update .gitignore
starstormhun Dec 8, 2023
ac6135b
v1.4.3
starstormhun Dec 9, 2023
017af36
whitespace adjustment
starstormhun Jan 11, 2024
01d47e2
Sync with unity project
starstormhun Jan 11, 2024
19f1394
Add eye matcaps, fix eye Z rendering
starstormhun Jan 12, 2024
005b4d1
Merge pull request #1 from starstormhun/AddEyeReflections
starstormhun Jan 12, 2024
3ec0a7b
Add eye tess shaders, remove shaderforgeexample
starstormhun Jan 13, 2024
93c15ab
Switch eye shaders to separate sampler base
starstormhun Jan 13, 2024
7d98570
Change Skin shaders to use separate samplers
starstormhun Jan 13, 2024
69d0f89
Change Item shaders to use separate sampler
starstormhun Jan 13, 2024
060f2f6
Convert Unity sampler defines to homebrew defines
starstormhun Jan 13, 2024
98050ed
Add tess versions of hair shaders
starstormhun Jan 14, 2024
a57f5e9
Add tess versions of hair and missing item tess shaders
starstormhun Jan 15, 2024
d90462a
Separate item shaders' fragment shader to file
starstormhun Jan 15, 2024
68a3db8
Fix eye matcap eye tracking
starstormhun Jan 16, 2024
0c62378
Merge pull request #2 from starstormhun/AddMoreTess
starstormhun Jan 16, 2024
2cac4f3
remove specularmap from manifest
starstormhun Jan 17, 2024
f2df22f
meta update
starstormhun Jan 17, 2024
27070b4
Update prefabs to fix eye layering
starstormhun Jan 18, 2024
eadfccd
Setup basic shader (copy of mainitem) and inputs
starstormhun Jan 18, 2024
4d24ae4
Make material and prefab
starstormhun Jan 18, 2024
4800842
Implement patterns and offset/rotation
starstormhun Jan 18, 2024
0cd6920
Implement pattern clamping
starstormhun Jan 19, 2024
d1bd7a2
Fix shading and normals
starstormhun Jan 19, 2024
c31a8f5
Add alpha shader
starstormhun Jan 20, 2024
02d4c3e
ShadowExtend trials
starstormhun Jan 20, 2024
21783fe
Add transparency slider to front hairs
starstormhun Jan 20, 2024
8e448f4
Add meta files
starstormhun Jan 20, 2024
682e307
Implement ambientshadowOFF, fix detailmask.g
starstormhun Jan 21, 2024
b118fc9
Fix linemask
starstormhun Jan 21, 2024
6698310
Merge pull request #3 from starstormhun/Studio-Item-Plus
starstormhun Jan 21, 2024
d84269c
Add tess variants of studio shaders
starstormhun Jan 21, 2024
a27d26b
Recompile shaders for 1.5.0
starstormhun Jan 22, 2024
b65b958
Fix reported 1.5.0 bugs
starstormhun Jan 24, 2024
e7eb883
Shader recompile for release
starstormhun Jan 24, 2024
ed056e9
Update KKPItemFrag.cginc
starstormhun Jan 27, 2024
294b304
Fix Item reflections and LineTex tiling on some clothing
starstormhun Jan 27, 2024
f7d43f1
Add specular normal scaling
starstormhun Jan 27, 2024
2abcf27
Update manifest.xml
starstormhun Jan 27, 2024
b980537
Add back culling to transparent front hair parts
starstormhun Jan 27, 2024
0f119c3
fix outline hole problem with transparent hairs
starstormhun Jan 27, 2024
8ed4000
Fix cum overlay tiling
starstormhun Jan 28, 2024
b145072
Expose AlphaMask on skin shaders
starstormhun May 17, 2024
f4957d3
v1.5.2
starstormhun May 17, 2024
b5f323a
Fix reported problems, recompile for release
starstormhun May 18, 2024
bc4e8b8
Fix version
starstormhun May 21, 2024
486be69
Reorganise Sampler/Texture2D stuff
starstormhun Jul 10, 2024
bfb3f96
Increment version to 1.5.3
starstormhun Jul 10, 2024
5745439
Fix casted shadows not having an effect on DisableShadowedMatcap
RikkiBalboa Aug 15, 2024
748dc07
Merge pull request #4 from RikkiBalboa/fix-disable-matcap-in-shadow
starstormhun Aug 20, 2024
d994a30
Bump version
starstormhun Aug 20, 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
21 changes: 4 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
/[Ll]ogs/
/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

Expand Down Expand Up @@ -43,18 +40,9 @@ ExportedObj/
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

#Ignore all .meta file
*.meta
#But not source file with postfix. which is everything but a folder
!*.*.meta
*.shader.meta
*.md.meta
*.cginc.meta
# Backup files
.bak
.bkp

# Unity3D generated file on crash reports
sysinfo.txt
Expand All @@ -64,5 +52,4 @@ sysinfo.txt
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

crashlytics-build.properties
8 changes: 8 additions & 0 deletions LICENSE.meta

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

9 changes: 9 additions & 0 deletions Material.meta

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

241 changes: 241 additions & 0 deletions Material/m_EyePlus.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: m_EyePlus
m_Shader: {fileID: 4800000, guid: 59a7b0c747d3fda439396b983ddca7d8, type: 3}
m_ShaderKeywords: _ALPHA_A_ON _ALPHA_B_ON _LINETEXON_ON _USELIGHTCOLORSPECULAR_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AnotherRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DisplaceTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HairGloss:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _LineMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMapDetail:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ReflectMap:
m_Texture: {fileID: 2800000, guid: 2aaeab3cbdeab0448a9753b4fd72f081, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ReflectMask:
m_Texture: {fileID: 2800000, guid: 2aaeab3cbdeab0448a9753b4fd72f081, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ReflectionMapCap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TessTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture2:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture3:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _expression:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _liquidmask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _overtex1:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _overtex2:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _overtex3:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DisableMapLights: 0
- _DisablePointLights: 0
- _DisableShadowedMatcap: 0
- _DisplaceFull: 0
- _DisplaceMultiplier: 0
- _DisplaceNormalMultiplier: 1
- _DstBlend: 0
- _EmissionIntensity: 1
- _ExpressionDepth: 1
- _ExpressionSize: 0.35
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _KKPRimAsDiffuse: 0
- _KKPRimIntensity: 0.75
- _KKPRimRotateX: 0
- _KKPRimRotateY: 0
- _KKPRimSoft: 1.5
- _LineWidthS: 1
- _Metallic: 0
- _Mode: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _OutlineOn: 1
- _Parallax: 0.02
- _ReflBlendDst: 0
- _ReflBlendSrc: 2
- _ReflBlendVal: 1
- _ReflectColMix: 1
- _ReflectRotation: 0
- _ReflectionVal: 1
- _Roughness: 0.75
- _ShadowExtend: 0.5
- _SmoothnessTextureChannel: 0
- _SpeclarHeight: 0.85
- _SpecularHairPower: 1
- _SpecularHeightInvert: 0
- _SpecularHighlights: 1
- _SpecularIsHighLightsPow: 64
- _SpecularIsHighlights: 0
- _SpecularIsHighlightsRange: 5
- _SpecularPower: 0
- _SpecularPowerNail: 0
- _SrcBlend: 1
- _TessBias: 75
- _TessMax: 4
- _TessMin: 1
- _TessSmooth: 0
- _Tolerance: 0.0005
- _UVSec: 0
- _UseDetailRAsSpecularMap: 0
- _UseKKPRim: 0
- _UseLightColorSpecular: 1
- _UseMatCapReflection: 1
- _UseMeshSpecular: 0
- _UseRampForLights: 0
- _UseRampForShadows: 0
- _UseRampForSpecular: 0
- _ZWrite: 1
- _alpha_a: 1
- _alpha_b: 1
- _exppower: 1
- _isHighLight: 0
- _linetexon: 1
- _liquidbbot: 0
- _liquidbtop: 0
- _liquidface: 0
- _liquidfbot: 0
- _liquidftop: 0
- _nip: 0
- _nip_specular: 0.5
- _nipsize: 0.5
- _notusetexspecular: 0
- _rimV: 0.75
- _rimpower: 0.5
- _rotation: 0
- _tex1mask: 0
m_Colors:
- _Clock: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color2: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 1}
- _Color3: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _CustomAmbient: {r: 0.6666667, g: 0.6666667, b: 0.6666667, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _GlossColor: {r: 1, g: 1, b: 1, a: 1}
- _KKPRimColor: {r: 1, g: 1, b: 1, a: 1}
- _LineColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _LiquidTiling: {r: 0, g: 0, b: 2, a: 2}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 0}
- _ReflectCol: {r: 1, g: 1, b: 1, a: 1}
- _ShadowColor: {r: 0.628, g: 0.628, b: 0.628, a: 1}
- _ShadowHSV: {r: 0, g: 0, b: 0, a: 0}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _overcolor1: {r: 1, g: 1, b: 1, a: 1}
- _overcolor2: {r: 1, g: 1, b: 1, a: 1}
- _overcolor3: {r: 1, g: 1, b: 1, a: 1}
- _shadowcolor: {r: 0.6298235, g: 0.6403289, b: 0.747, a: 1}
9 changes: 9 additions & 0 deletions Material/m_EyePlus.mat.meta

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

Loading