fix(webgl): use forceCanvas for Live2DCat to avoid dual WebGL context conflicts

Reverts shared-context approach. Live2DCat gets its own canvas with
forceCanvas:true (Canvas2D renderer), which avoids the WebGL bindBuffer
spam entirely. Cleaned up onAppReady prop from KiraAvatar.
This commit is contained in:
2026-06-05 13:08:18 -04:00
parent be1e51cc9a
commit 37f8bf59a0
4 changed files with 41 additions and 33 deletions
+1 -3
View File
@@ -33,7 +33,6 @@ export default function App() {
const [currentOutfit, setCurrentOutfit] = useState('cozy-hoodie'); const [currentOutfit, setCurrentOutfit] = useState('cozy-hoodie');
const [currentAcc, setCurrentAcc] = useState<string | null>(null); const [currentAcc, setCurrentAcc] = useState<string | null>(null);
const [textInput, setTextInput] = useState(''); const [textInput, setTextInput] = useState('');
const [pixiApp, setPixiApp] = useState<any>(null);
useEffect(() => { useEffect(() => {
if (preferences.scene) setCurrentSceneId(preferences.scene); if (preferences.scene) setCurrentSceneId(preferences.scene);
@@ -148,7 +147,6 @@ export default function App() {
outfit={currentOutfit} outfit={currentOutfit}
accessory={currentAcc} accessory={currentAcc}
onTalkToggle={handleTalkToggle} onTalkToggle={handleTalkToggle}
onAppReady={setPixiApp}
/> />
</div> </div>
@@ -157,7 +155,7 @@ export default function App() {
<MusicPlayer /> <MusicPlayer />
<WhiteNoise /> <WhiteNoise />
<Wardrobe onOutfitChange={handleOutfitChange} onAccessoryChange={handleAccessoryChange} /> <Wardrobe onOutfitChange={handleOutfitChange} onAccessoryChange={handleAccessoryChange} />
<PetZone app={pixiApp} /> <PetZone />
</div> </div>
</div> </div>
+1 -3
View File
@@ -7,7 +7,6 @@ interface Props {
outfit: string; outfit: string;
accessory: string | null; accessory: string | null;
onTalkToggle: () => void; onTalkToggle: () => void;
onAppReady?: (app: any) => void;
} }
type ExpressionName = 'Normal' | 'Smile' | 'Sad' | 'Angry' | 'Surprised' | 'Blushing'; type ExpressionName = 'Normal' | 'Smile' | 'Sad' | 'Angry' | 'Surprised' | 'Blushing';
@@ -82,8 +81,7 @@ export default function KiraAvatar(props: Props) {
app.stage.addChild(model as any); app.stage.addChild(model as any);
(model as any).isInteractive = () => false; (model as any).isInteractive = () => false;
if (!mounted) return;
if (props.onAppReady) props.onAppReady(app);
try { try {
textureRef.current = { textureRef.current = {
+37 -20
View File
@@ -1,42 +1,58 @@
import { useEffect, useRef } from 'react'; import { useEffect, useRef } from 'react';
interface Props { interface Props {
app: any;
className?: string; className?: string;
} }
export default function Live2DCat({ app, className }: Props) { export default function Live2DCat({ className }: Props) {
const modelRef = useRef<any>(null); const canvasRef = useRef<HTMLCanvasElement>(null);
useEffect(() => { useEffect(() => {
if (!app) return;
let mounted = true; let mounted = true;
const canvas = canvasRef.current;
if (!canvas) return;
let app: any = null;
const init = async () => { const init = async () => {
try { try {
const { Application, Ticker } = await import('pixi.js');
const { Live2DModel } = await import('pixi-live2d-display/cubism4'); const { Live2DModel } = await import('pixi-live2d-display/cubism4');
(Live2DModel as any).registerTicker(Ticker as any);
const w = canvas.clientWidth || 120;
const h = canvas.clientHeight || 120;
// forceCanvas avoids WebGL context conflicts with KiraAvatar's context
app = new Application({
view: canvas,
width: w,
height: h,
antialias: true,
resolution: Math.min(window.devicePixelRatio || 1, 2),
backgroundAlpha: 0,
autoDensity: true,
forceCanvas: true,
});
if (!mounted) { app.destroy(true); return; }
const model = await Live2DModel.from('/live2d/models/little-cat/LittleCat.model3.json', { const model = await Live2DModel.from('/live2d/models/little-cat/LittleCat.model3.json', {
autoInteract: false, autoInteract: false,
}); });
if (!mounted) return; if (!mounted) { app.destroy(true); return; }
// Scale to fit ~120x120 area on the shared stage
const sw = app.screen.width; const sw = app.screen.width;
const sh = app.screen.height; const sh = app.screen.height;
const targetW = 120; const s = Math.min((sw * 0.85) / model.width, (sh * 0.85) / model.height);
const targetH = 120;
const s = Math.min(targetW / model.width, targetH / model.height);
model.scale.set(s); model.scale.set(s);
model.anchor.set(0.5, 0.5); model.anchor.set(0.5, 0.5);
// Position near top-left corner with some padding model.position.set(sw / 2, sh / 2);
model.position.set(80, 80);
app.stage.addChild(model as any); app.stage.addChild(model as any);
(model as any).isInteractive = () => false; (model as any).isInteractive = () => false;
modelRef.current = model;
try { model.motion('Idle'); } catch { /* */ } try { model.motion('Idle'); } catch { /* */ }
} catch (e) { } catch (e) {
console.warn('[Live2DCat]', e); console.warn('[Live2DCat]', e);
} }
@@ -46,14 +62,15 @@ export default function Live2DCat({ app, className }: Props) {
return () => { return () => {
mounted = false; mounted = false;
if (modelRef.current) { if (app) { app.destroy(true, { children: true }); }
app.stage.removeChild(modelRef.current);
modelRef.current.destroy?.();
modelRef.current = null;
}
}; };
}, [app]); }, []);
// Live2DCat no longer renders its own canvas — it shares the KiraAvatar canvas return (
return null; <canvas
ref={canvasRef}
className={className}
style={{ display: 'block' }}
/>
);
} }
+2 -7
View File
@@ -1,10 +1,6 @@
import Live2DCat from './Live2DCat'; import Live2DCat from './Live2DCat';
interface Props { export default function PetZone() {
app: any;
}
export default function PetZone({ app }: Props) {
return ( return (
<div className="p-4 relative overflow-hidden" style={{ minHeight: 140 }}> <div className="p-4 relative overflow-hidden" style={{ minHeight: 140 }}>
<h3 className="text-sm font-bold text-kira-plum mb-2 flex items-center gap-2"> <h3 className="text-sm font-bold text-kira-plum mb-2 flex items-center gap-2">
@@ -12,8 +8,7 @@ export default function PetZone({ app }: Props) {
</h3> </h3>
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">
<div className="flex flex-col items-center"> <div className="flex flex-col items-center">
{/* Cat model is rendered on the shared KiraAvatar canvas */} <Live2DCat className="w-28 h-28" />
<Live2DCat app={app} />
<span className="text-[10px] text-kira-plum/60 mt-1 font-medium">Mochi</span> <span className="text-[10px] text-kira-plum/60 mt-1 font-medium">Mochi</span>
</div> </div>
</div> </div>