Skip to content

Commit

Permalink
9.0.53
Browse files Browse the repository at this point in the history 
Fixed a problem with exporting things
Fixed a bug with point lights in same as base lighting not working properly with realistic, wrapped and cloth
  • Loading branch information
@poiyomi
poiyomi committed Mar 22, 2024
1 parent 808feb4 commit 669fa49
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion _PoiyomiShaders/Scripts.meta
View file

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

2 changes: 1 addition & 1 deletion _PoiyomiShaders/Scripts/poi-tools/Editor/PoiImportExportChecker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static PoiImportExportChecker()
PackageExport_ExportMethod = PackageExport_Type.GetMethod("Export", BindingFlags.NonPublic | BindingFlags.Instance);

CustomExport_Method = typeof(PoiImportExportChecker).GetMethod(nameof(CustomExport));
DetourExportMethod();
//DetourExportMethod();
}
public static void CustomExport()
{
Expand Down
2 changes: 1 addition & 1 deletion _PoiyomiShaders/Shaders.meta
View file

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

2 changes: 1 addition & 1 deletion _PoiyomiShaders/Shaders/7.3.meta
View file

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

2 changes: 1 addition & 1 deletion _PoiyomiShaders/Shaders/7.3/Pro.meta
View file

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

2 changes: 1 addition & 1 deletion _PoiyomiShaders/Shaders/7.3/Pro/Shaders.meta
View file

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

2 changes: 1 addition & 1 deletion _PoiyomiShaders/Shaders/8.1.meta
View file

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

2 changes: 1 addition & 1 deletion _PoiyomiShaders/Shaders/9.0.meta
View file

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

14 changes: 7 additions & 7 deletions _PoiyomiShaders/Shaders/9.0/Toon/Poiyomi Toon Early Outline.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
{
Properties
{
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.52</color>", Float) = 0
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.53</color>", Float) = 0
[HideInInspector] shader_is_using_thry_editor ("", Float) = 0
[HideInInspector] shader_locale ("0db0b86376c3dca4b9a6828ef8615fe0", Float) = 0
[HideInInspector] footer_youtube ("{texture:{name:icon-youtube,height:16},action:{type:URL,data:https://www.youtube.com/poiyomi},hover:YOUTUBE}", Float) = 0
Expand Down Expand Up @@ -14273,7 +14273,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -14289,7 +14289,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -26520,7 +26520,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -26536,7 +26536,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -41304,7 +41304,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -41320,7 +41320,7 @@ Shader ".poiyomi/Poiyomi Toon Outline Early"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down
14 changes: 7 additions & 7 deletions _PoiyomiShaders/Shaders/9.0/Toon/Poiyomi Toon Grab Pass.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
{
Properties
{
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.52</color>", Float) = 0
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.53</color>", Float) = 0
[HideInInspector] shader_is_using_thry_editor ("", Float) = 0
[HideInInspector] shader_locale ("0db0b86376c3dca4b9a6828ef8615fe0", Float) = 0
[HideInInspector] footer_youtube ("{texture:{name:icon-youtube,height:16},action:{type:URL,data:https://www.youtube.com/poiyomi},hover:YOUTUBE}", Float) = 0
Expand Down Expand Up @@ -18223,7 +18223,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -18239,7 +18239,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -33159,7 +33159,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -33175,7 +33175,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -45197,7 +45197,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -45213,7 +45213,7 @@ Shader ".poiyomi/Poiyomi Toon Grab Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down
22 changes: 11 additions & 11 deletions _PoiyomiShaders/Shaders/9.0/Toon/Poiyomi Toon Two Pass.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
{
Properties
{
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.52</color>", Float) = 0
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.53</color>", Float) = 0
[HideInInspector] shader_is_using_thry_editor ("", Float) = 0
[HideInInspector] shader_locale ("0db0b86376c3dca4b9a6828ef8615fe0", Float) = 0
[HideInInspector] footer_youtube ("{texture:{name:icon-youtube,height:16},action:{type:URL,data:https://www.youtube.com/poiyomi},hover:YOUTUBE}", Float) = 0
Expand Down Expand Up @@ -18038,7 +18038,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -18054,7 +18054,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -32823,7 +32823,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -32839,7 +32839,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -44849,7 +44849,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -44865,7 +44865,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -57093,7 +57093,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -57109,7 +57109,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -71880,7 +71880,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -71896,7 +71896,7 @@ Shader ".poiyomi/Poiyomi Toon Two Pass"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down
14 changes: 7 additions & 7 deletions _PoiyomiShaders/Shaders/9.0/Toon/Poiyomi Toon World.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Shader ".poiyomi/Poiyomi Toon World"
{
Properties
{
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.52</color>", Float) = 0
[HideInInspector] shader_master_label ("<color=#E75898ff>Poiyomi 9.0.53</color>", Float) = 0
[HideInInspector] shader_is_using_thry_editor ("", Float) = 0
[HideInInspector] shader_locale ("0db0b86376c3dca4b9a6828ef8615fe0", Float) = 0
[HideInInspector] footer_youtube ("{texture:{name:icon-youtube,height:16},action:{type:URL,data:https://www.youtube.com/poiyomi},hover:YOUTUBE}", Float) = 0
Expand Down Expand Up @@ -18037,7 +18037,7 @@ Shader ".poiyomi/Poiyomi Toon World"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -18053,7 +18053,7 @@ Shader ".poiyomi/Poiyomi Toon World"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -32817,7 +32817,7 @@ Shader ".poiyomi/Poiyomi Toon World"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -32833,7 +32833,7 @@ Shader ".poiyomi/Poiyomi Toon World"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down Expand Up @@ -44839,7 +44839,7 @@ Shader ".poiyomi/Poiyomi Toon World"
#ifdef POI_PASS_ADD
if (_LightingAdditiveType == 3)
{
#if defined(point) || defined(SPOT)
#if defined(POINT) || defined(SPOT)
#if defined(_LIGHTINGMODE_REALISTIC) || defined(_LIGHTINGMODE_CLOTH) || defined(_LIGHTINGMODE_WRAPPED)
poiLight.rampedLightMap = max(0, poiLight.nDotL);
poiLight.finalLighting = poiLight.directColor * attenuation * max(0, poiLight.nDotL) * poiLight.detailShadow * shadowAttenuation;
Expand All @@ -44855,7 +44855,7 @@ Shader ".poiyomi/Poiyomi Toon World"
return;
}
// Toon
else if (_LightingAdditiveType == 1)
if (_LightingAdditiveType == 1)
{
#if defined(POINT_COOKIE) || defined(DIRECTIONAL_COOKIE)
float passthrough = 0;
Expand Down
Loading

0 comments on commit 669fa49

Please sign in to comment.