forked from phenom/healer-man
Release Healer Man 0.1.32
This commit is contained in:
1 parent
d3d6aaebdb
commit
6dcb1034e5
102 files changed
+10772
-788
No files matched your search
@@ -50,6 +50,7 @@ import {
|
||||
type OriginalCombatMeshGraph,
|
||||
} from "./originalCombatMeshRuntime";
|
||||
import { updateCombatEffectAnchorPosition } from "./combatEffectAnchorRegistry";
|
||||
import { shouldUseGeneratedOriginalFallback } from "./combatEffectRuntime";
|
||||
import { OriginalWowModel } from "./OriginalWowModel";
|
||||
import { OriginalParticleGeometry } from "./OriginalParticleGeometry";
|
||||
import {
|
||||
@@ -99,9 +100,10 @@ const vertexShader = /* glsl */ `
|
||||
vParticleAlpha = particleAlpha;
|
||||
vParticleFrame = particleFrame;
|
||||
vec4 viewPosition = modelViewMatrix * vec4(position, 1.0);
|
||||
float inheritedScale = length(modelViewMatrix[0].xyz);
|
||||
gl_Position = projectionMatrix * viewPosition;
|
||||
gl_PointSize = clamp(
|
||||
particleSize * viewportHeight / max(1.0, -viewPosition.z),
|
||||
particleSize * inheritedScale * viewportHeight / max(1.0, -viewPosition.z),
|
||||
1.0,
|
||||
256.0
|
||||
);
|
||||
@@ -894,16 +896,23 @@ export const OriginalCombatEffect = memo(function OriginalCombatEffect({
|
||||
const selection = loaded === null
|
||||
? null
|
||||
: selectCombatEffectRender("original", loaded.map((item) => item.asset));
|
||||
const hasOriginalInstantKit = event.phase === "release" && event.instantCast === true
|
||||
&& (["cast-start", "impact", "aura-start"] as const).some((phase) => (
|
||||
combatOriginalPhaseAssets({ ...event, phase }).length > 0
|
||||
));
|
||||
const resolvedFallback = shouldUseGeneratedOriginalFallback(event, hasOriginalInstantKit)
|
||||
? fallback
|
||||
: null;
|
||||
useEffect(() => {
|
||||
if (
|
||||
loaded === null
|
||||
|| selection?.kind === "original"
|
||||
|| fallback !== null
|
||||
|| resolvedFallback !== null
|
||||
|| completedMissingOriginalRef.current
|
||||
) return;
|
||||
completedMissingOriginalRef.current = true;
|
||||
onDone();
|
||||
}, [fallback, loaded, onDone, selection?.kind]);
|
||||
}, [loaded, onDone, resolvedFallback, selection?.kind]);
|
||||
|
||||
if (loaded === null || selection === null) return null;
|
||||
return selection.kind === "original" ? (
|
||||
@@ -914,7 +923,7 @@ export const OriginalCombatEffect = memo(function OriginalCombatEffect({
|
||||
loaded={loaded}
|
||||
onDone={onDone}
|
||||
/>
|
||||
) : fallback;
|
||||
) : resolvedFallback;
|
||||
}, (previous, next) => (
|
||||
previous.event === next.event
|
||||
&& previous.alternateOriginalPhase === next.alternateOriginalPhase
|
||||
|
||||
Reference in new issue
Block a user