fix(webgl): share single Pixi context between KiraAvatar and Live2DCat

Eliminates WebGL bindBuffer/bindTexture spam from dual Application contexts.
Cat model now loads onto KiraAvatar's shared stage via onAppReady callback.
This commit is contained in:
2026-06-05 13:04:43 -04:00
parent 017c81cffa
commit be1e51cc9a
4 changed files with 33 additions and 51 deletions
+3 -1
View File
@@ -33,6 +33,7 @@ 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);
@@ -147,6 +148,7 @@ export default function App() {
outfit={currentOutfit} outfit={currentOutfit}
accessory={currentAcc} accessory={currentAcc}
onTalkToggle={handleTalkToggle} onTalkToggle={handleTalkToggle}
onAppReady={setPixiApp}
/> />
</div> </div>
@@ -155,7 +157,7 @@ export default function App() {
<MusicPlayer /> <MusicPlayer />
<WhiteNoise /> <WhiteNoise />
<Wardrobe onOutfitChange={handleOutfitChange} onAccessoryChange={handleAccessoryChange} /> <Wardrobe onOutfitChange={handleOutfitChange} onAccessoryChange={handleAccessoryChange} />
<PetZone /> <PetZone app={pixiApp} />
</div> </div>
</div> </div>
+3
View File
@@ -7,6 +7,7 @@ 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,6 +83,8 @@ 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 (props.onAppReady) props.onAppReady(app);
try { try {
textureRef.current = { textureRef.current = {
index: 2, index: 2,
+20 -48
View File
@@ -1,58 +1,42 @@
import { useEffect, useRef } from 'react'; import { useEffect, useRef } from 'react';
interface Props { interface Props {
app: any;
className?: string; className?: string;
} }
export default function Live2DCat({ className }: Props) { export default function Live2DCat({ app, className }: Props) {
const canvasRef = useRef<HTMLCanvasElement>(null); const modelRef = useRef<any>(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 {
await loadScript('/live2d/cubism/live2dcubismcore.min.js');
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;
app = new Application({
view: canvas,
width: w,
height: h,
antialias: true,
resolution: Math.min(window.devicePixelRatio || 1, 2),
backgroundAlpha: 0,
autoDensity: 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) { app.destroy(true); return; } if (!mounted) return;
// Scale to fit the small canvas // 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 s = Math.min((sw * 0.85) / model.width, (sh * 0.85) / model.height); const targetW = 120;
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);
model.position.set(sw / 2, sh / 2); // Position near top-left corner with some padding
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);
} }
@@ -62,26 +46,14 @@ export default function Live2DCat({ className }: Props) {
return () => { return () => {
mounted = false; mounted = false;
if (app) { app.destroy(true, { children: true }); } if (modelRef.current) {
app.stage.removeChild(modelRef.current);
modelRef.current.destroy?.();
modelRef.current = null;
}
}; };
}, []); }, [app]);
return ( // Live2DCat no longer renders its own canvas — it shares the KiraAvatar canvas
<canvas return null;
ref={canvasRef}
className={className}
style={{ display: 'block' }}
/>
);
}
function loadScript(src: string): Promise<void> {
return new Promise((resolve, reject) => {
if (document.querySelector('script[src="' + src + '"]')) { resolve(); return; }
const s = document.createElement('script');
s.src = src;
s.onload = () => resolve();
s.onerror = () => reject(new Error('Failed ' + src));
document.head.appendChild(s);
});
} }
+7 -2
View File
@@ -1,6 +1,10 @@
import Live2DCat from './Live2DCat'; import Live2DCat from './Live2DCat';
export default function PetZone() { interface Props {
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">
@@ -8,7 +12,8 @@ export default function PetZone() {
</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">
<Live2DCat className="w-28 h-28" /> {/* Cat model is rendered on the shared KiraAvatar canvas */}
<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>