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.

Sign up for GitHub

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

Fix FixNow button functionality to include custom coords in custom vertex streams when using second texture of alpha transition #102

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Fix FixNow button functionality to include custom coords in custom vertex streams when using second texture of alpha transition #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 26 additions & 10 deletions Assets/Nova/Editor/Core/Scripts/RendererErrorHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// --------------------------------------------------------------
// Copyright 2023 CyberAgent, Inc.
// Copyright 2025 CyberAgent, Inc.
// --------------------------------------------------------------

using System.Collections.Generic;
Expand Down Expand Up @@ -141,16 +141,32 @@ private static bool IsCustomCoordUsedInParallax(ParticlesUberCommonMaterialPrope
private static bool IsCustomCoordUsedInAlphaTransition(
ParticlesUberCommonMaterialProperties commonMaterialProperties)
{
var mode = (AlphaTransitionMode)commonMaterialProperties.AlphaTransitionModeProp.Value.floatValue;
var props = commonMaterialProperties;
var mode = (AlphaTransitionMode)props.AlphaTransitionModeProp.Value.floatValue;
if (mode == AlphaTransitionMode.None) return false;
var isCustomCoordUsed = false;
isCustomCoordUsed = IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionProgressCoordProp);
isCustomCoordUsed |= IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionMapOffsetXCoordProp)
|| IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionMapOffsetYCoordProp);
isCustomCoordUsed |=
(AlphaTransitionMapMode)commonMaterialProperties.AlphaTransitionMapModeProp.Value.floatValue !=
AlphaTransitionMapMode.SingleTexture
&& IsCustomCoordUsed(commonMaterialProperties.AlphaTransitionMapProgressCoordProp);

bool isCustomCoordUsed;
var isFlipBook = (AlphaTransitionMapMode)props.AlphaTransitionMapModeProp.Value.floatValue !=
AlphaTransitionMapMode.SingleTexture;
// 1st texture
{
isCustomCoordUsed = IsCustomCoordUsed(props.AlphaTransitionProgressCoordProp);
isCustomCoordUsed |= IsCustomCoordUsed(props.AlphaTransitionMapOffsetXCoordProp)
|| IsCustomCoordUsed(props.AlphaTransitionMapOffsetYCoordProp);
isCustomCoordUsed |= isFlipBook && IsCustomCoordUsed(props.AlphaTransitionMapProgressCoordProp);
}
// 2nd texture
{
if ((AlphaTransitionBlendMode)props.AlphaTransitionSecondTextureBlendModeProp.Value.floatValue !=
AlphaTransitionBlendMode.None)
{
isCustomCoordUsed |= IsCustomCoordUsed(props.AlphaTransitionProgressCoordSecondTextureProp);
isCustomCoordUsed |= IsCustomCoordUsed(props.AlphaTransitionMapSecondTextureOffsetXCoordProp) ||
IsCustomCoordUsed(props.AlphaTransitionMapSecondTextureOffsetYCoordProp);
isCustomCoordUsed |= isFlipBook &&
IsCustomCoordUsed(props.AlphaTransitionMapSecondTextureProgressCoordProp);
}
}
return isCustomCoordUsed;
}

Expand Down
Loading