distark-render 1.1.6 → 1.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -0
- package/assets/presets/jumping-jack.json +194 -0
- package/assets/tank.json +0 -0
- package/dist/cli/animate.d.ts +0 -0
- package/dist/cli/animate.d.ts.map +0 -0
- package/dist/cli/animate.js +0 -0
- package/dist/cli/animate.js.map +0 -0
- package/dist/cli/diff.d.ts +0 -0
- package/dist/cli/diff.d.ts.map +0 -0
- package/dist/cli/diff.js +0 -0
- package/dist/cli/diff.js.map +0 -0
- package/dist/cli/distark-check.d.ts +0 -0
- package/dist/cli/distark-check.d.ts.map +0 -0
- package/dist/cli/distark-check.js +20 -14
- package/dist/cli/distark-check.js.map +1 -1
- package/dist/cli/query.d.ts +0 -0
- package/dist/cli/query.d.ts.map +0 -0
- package/dist/cli/query.js +0 -0
- package/dist/cli/query.js.map +0 -0
- package/dist/cli/record.d.ts +0 -0
- package/dist/cli/record.d.ts.map +0 -0
- package/dist/cli/record.js +0 -0
- package/dist/cli/record.js.map +0 -0
- package/dist/cli/render.d.ts +0 -0
- package/dist/cli/render.d.ts.map +0 -0
- package/dist/cli/render.js +0 -0
- package/dist/cli/render.js.map +0 -0
- package/dist/cli/scene.d.ts +15 -0
- package/dist/cli/scene.d.ts.map +1 -0
- package/dist/cli/scene.js +239 -0
- package/dist/cli/scene.js.map +1 -0
- package/dist/cli/shared.d.ts +0 -0
- package/dist/cli/shared.d.ts.map +0 -0
- package/dist/cli/shared.js +0 -0
- package/dist/cli/shared.js.map +0 -0
- package/dist/cli/test.d.ts +0 -0
- package/dist/cli/test.d.ts.map +0 -0
- package/dist/cli/test.js +0 -0
- package/dist/cli/test.js.map +0 -0
- package/dist/cli/verify.d.ts +0 -0
- package/dist/cli/verify.d.ts.map +0 -0
- package/dist/cli/verify.js +0 -0
- package/dist/cli/verify.js.map +0 -0
- package/dist/modules/adapters/p5Renderer.d.ts +0 -0
- package/dist/modules/adapters/p5Renderer.d.ts.map +0 -0
- package/dist/modules/adapters/p5Renderer.js +0 -0
- package/dist/modules/adapters/p5Renderer.js.map +0 -0
- package/dist/modules/adapters/skiaRenderer.d.ts +0 -0
- package/dist/modules/adapters/skiaRenderer.d.ts.map +0 -0
- package/dist/modules/adapters/skiaRenderer.js +0 -0
- package/dist/modules/adapters/skiaRenderer.js.map +0 -0
- package/dist/modules/animationDiff.d.ts +0 -0
- package/dist/modules/animationDiff.d.ts.map +0 -0
- package/dist/modules/animationDiff.js +0 -0
- package/dist/modules/animationDiff.js.map +0 -0
- package/dist/modules/browserSceneRenderer.d.ts +21 -0
- package/dist/modules/browserSceneRenderer.d.ts.map +1 -0
- package/dist/modules/browserSceneRenderer.js +263 -0
- package/dist/modules/browserSceneRenderer.js.map +1 -0
- package/dist/modules/eyeSystem.d.ts +0 -0
- package/dist/modules/eyeSystem.d.ts.map +0 -0
- package/dist/modules/eyeSystem.js +0 -0
- package/dist/modules/eyeSystem.js.map +0 -0
- package/dist/modules/imageLoad.d.ts +0 -0
- package/dist/modules/imageLoad.d.ts.map +0 -0
- package/dist/modules/imageLoad.js +0 -0
- package/dist/modules/imageLoad.js.map +0 -0
- package/dist/modules/mouthSystem.d.ts +0 -0
- package/dist/modules/mouthSystem.d.ts.map +0 -0
- package/dist/modules/mouthSystem.js +0 -0
- package/dist/modules/mouthSystem.js.map +0 -0
- package/dist/modules/renderRig.d.ts +0 -0
- package/dist/modules/renderRig.d.ts.map +1 -1
- package/dist/modules/renderRig.js +4 -12
- package/dist/modules/renderRig.js.map +1 -1
- package/dist/modules/sceneRenderer.d.ts +160 -0
- package/dist/modules/sceneRenderer.d.ts.map +1 -0
- package/dist/modules/sceneRenderer.js +616 -0
- package/dist/modules/sceneRenderer.js.map +1 -0
- package/dist/tests/helpers.d.ts +0 -0
- package/dist/tests/helpers.d.ts.map +0 -0
- package/dist/tests/helpers.js +0 -0
- package/dist/tests/helpers.js.map +0 -0
- package/dist/tests/test-animation-diff-rendering.d.ts +0 -0
- package/dist/tests/test-animation-diff-rendering.d.ts.map +0 -0
- package/dist/tests/test-animation-diff-rendering.js +0 -0
- package/dist/tests/test-animation-diff-rendering.js.map +0 -0
- package/dist/tests/test-animation-diff.d.ts +0 -0
- package/dist/tests/test-animation-diff.d.ts.map +0 -0
- package/dist/tests/test-animation-diff.js +0 -0
- package/dist/tests/test-animation-diff.js.map +0 -0
- package/dist/tests/test-autofit.d.ts +0 -0
- package/dist/tests/test-autofit.d.ts.map +0 -0
- package/dist/tests/test-autofit.js +0 -0
- package/dist/tests/test-autofit.js.map +0 -0
- package/dist/tests/test-base-autofit.d.ts +0 -0
- package/dist/tests/test-base-autofit.d.ts.map +0 -0
- package/dist/tests/test-base-autofit.js +0 -0
- package/dist/tests/test-base-autofit.js.map +0 -0
- package/dist/tests/test-browser-scene.d.ts +2 -0
- package/dist/tests/test-browser-scene.d.ts.map +1 -0
- package/dist/tests/test-browser-scene.js +132 -0
- package/dist/tests/test-browser-scene.js.map +1 -0
- package/dist/tests/test-cli.d.ts +0 -0
- package/dist/tests/test-cli.d.ts.map +0 -0
- package/dist/tests/test-cli.js +0 -0
- package/dist/tests/test-cli.js.map +0 -0
- package/dist/tests/test-image-loading.d.ts +0 -0
- package/dist/tests/test-image-loading.d.ts.map +0 -0
- package/dist/tests/test-image-loading.js +0 -0
- package/dist/tests/test-image-loading.js.map +0 -0
- package/dist/tests/test-joint-movement.d.ts +0 -0
- package/dist/tests/test-joint-movement.d.ts.map +0 -0
- package/dist/tests/test-joint-movement.js +0 -0
- package/dist/tests/test-joint-movement.js.map +0 -0
- package/dist/tests/test-p5-image-types.d.ts +0 -0
- package/dist/tests/test-p5-image-types.d.ts.map +0 -0
- package/dist/tests/test-p5-image-types.js +0 -0
- package/dist/tests/test-p5-image-types.js.map +0 -0
- package/dist/tests/test-render-cache-visual.d.ts +2 -0
- package/dist/tests/test-render-cache-visual.d.ts.map +1 -0
- package/dist/tests/test-render-cache-visual.js +108 -0
- package/dist/tests/test-render-cache-visual.js.map +1 -0
- package/dist/tests/test-render-cache.d.ts +2 -0
- package/dist/tests/test-render-cache.d.ts.map +1 -0
- package/dist/tests/test-render-cache.js +124 -0
- package/dist/tests/test-render-cache.js.map +1 -0
- package/dist/tests/test-scene.d.ts +13 -0
- package/dist/tests/test-scene.d.ts.map +1 -0
- package/dist/tests/test-scene.js +528 -0
- package/dist/tests/test-scene.js.map +1 -0
- package/dist/tests/test-skia.d.ts +0 -0
- package/dist/tests/test-skia.d.ts.map +0 -0
- package/dist/tests/test-skia.js +0 -0
- package/dist/tests/test-skia.js.map +0 -0
- package/dist/tests/test-torso-pivot.d.ts +0 -0
- package/dist/tests/test-torso-pivot.d.ts.map +0 -0
- package/dist/tests/test-torso-pivot.js +0 -0
- package/dist/tests/test-torso-pivot.js.map +0 -0
- package/dist/tests/test-visual-verification.d.ts +0 -0
- package/dist/tests/test-visual-verification.d.ts.map +0 -0
- package/dist/tests/test-visual-verification.js +0 -0
- package/dist/tests/test-visual-verification.js.map +0 -0
- package/dist/types.d.ts +0 -0
- package/dist/types.d.ts.map +0 -0
- package/dist/types.js +0 -0
- package/dist/types.js.map +0 -0
- package/package.json +9 -1
|
File without changes
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { type WorldJSON } from './sceneRenderer.js';
|
|
2
|
+
import type { RigData } from '../types.js';
|
|
3
|
+
export type BrowserWorldJSON = WorldJSON;
|
|
4
|
+
export interface BrowserSceneRendererOptions {
|
|
5
|
+
loadedImagesByCharacter?: Record<string, Record<string, any>>;
|
|
6
|
+
backgroundColor?: string;
|
|
7
|
+
}
|
|
8
|
+
export declare class BrowserSceneRenderer {
|
|
9
|
+
private world;
|
|
10
|
+
private rigDataMap;
|
|
11
|
+
private renderers;
|
|
12
|
+
private loadedImagesByCharacter;
|
|
13
|
+
private backgroundColor;
|
|
14
|
+
private resolvedAnims;
|
|
15
|
+
constructor(world: BrowserWorldJSON, rigDataMap: Record<string, RigData>, options?: BrowserSceneRendererOptions);
|
|
16
|
+
private ensureImagesLoaded;
|
|
17
|
+
private getInterpolatedRig;
|
|
18
|
+
private renderObjects;
|
|
19
|
+
renderFrame(canvas: HTMLCanvasElement, time: number): Promise<void>;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=browserSceneRenderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browserSceneRenderer.d.ts","sourceRoot":"","sources":["../../modules/browserSceneRenderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAM3C,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAEzC,MAAM,WAAW,2BAA2B;IACxC,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAuHD,qBAAa,oBAAoB;IAC7B,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,aAAa,CAA6B;gBAEtC,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAE,2BAAgC;YAcrG,kBAAkB;IAQhC,OAAO,CAAC,kBAAkB;IAmE1B,OAAO,CAAC,aAAa;IAcf,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA2C5E"}
|
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
import { CharacterRigRenderer } from './renderRig.js';
|
|
2
|
+
import { evaluateScene } from './sceneRenderer.js';
|
|
3
|
+
import { expandDiffBasedAnimation, isDiffBasedFormat } from './animationDiff.js';
|
|
4
|
+
const BASE_WIDTH = 2560;
|
|
5
|
+
const BASE_HEIGHT = 1440;
|
|
6
|
+
const DEFAULT_BACKGROUND = '#f0f0f0';
|
|
7
|
+
function lerpAngle(start, end, t) {
|
|
8
|
+
let diff = end - start;
|
|
9
|
+
diff = diff - Math.round(diff / (2 * Math.PI)) * (2 * Math.PI);
|
|
10
|
+
return start + diff * t;
|
|
11
|
+
}
|
|
12
|
+
function lerp(a, b, t) {
|
|
13
|
+
return a + (b - a) * t;
|
|
14
|
+
}
|
|
15
|
+
function interpolatePose(startPose, endPose, progress) {
|
|
16
|
+
const interp = {
|
|
17
|
+
rotationValues: {},
|
|
18
|
+
selfRotationValues: {},
|
|
19
|
+
dimensionValues: {},
|
|
20
|
+
pivotPoints: {}
|
|
21
|
+
};
|
|
22
|
+
if (startPose.rotationValues) {
|
|
23
|
+
for (const part of Object.keys(startPose.rotationValues)) {
|
|
24
|
+
const sv = startPose.rotationValues[part] ?? 0;
|
|
25
|
+
const ev = endPose.rotationValues?.[part] ?? sv;
|
|
26
|
+
interp.rotationValues[part] = lerpAngle(sv, ev, progress);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
if (startPose.selfRotationValues) {
|
|
30
|
+
for (const part of Object.keys(startPose.selfRotationValues)) {
|
|
31
|
+
const sv = startPose.selfRotationValues[part] ?? 0;
|
|
32
|
+
const ev = endPose.selfRotationValues?.[part] ?? sv;
|
|
33
|
+
interp.selfRotationValues[part] = lerpAngle(sv, ev, progress);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (startPose.dimensionValues) {
|
|
37
|
+
for (const part of Object.keys(startPose.dimensionValues)) {
|
|
38
|
+
const a = startPose.dimensionValues[part];
|
|
39
|
+
const b = endPose.dimensionValues?.[part] ?? a;
|
|
40
|
+
interp.dimensionValues[part] = {
|
|
41
|
+
width: lerp(a.width, b.width, progress),
|
|
42
|
+
height: lerp(a.height, b.height, progress)
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (startPose.pivotPoints) {
|
|
47
|
+
for (const pivot of Object.keys(startPose.pivotPoints)) {
|
|
48
|
+
const a = startPose.pivotPoints[pivot];
|
|
49
|
+
const b = endPose.pivotPoints?.[pivot] ?? a;
|
|
50
|
+
interp.pivotPoints[pivot] = {
|
|
51
|
+
x: lerp(a.x, b.x, progress),
|
|
52
|
+
y: lerp(a.y, b.y, progress)
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return interp;
|
|
57
|
+
}
|
|
58
|
+
function isOrcPropertyFormat(frames) {
|
|
59
|
+
return frames?.length > 0 && 'property' in frames[0] && 'time' in frames[0];
|
|
60
|
+
}
|
|
61
|
+
function interpPropAtTime(kfs, t) {
|
|
62
|
+
const s = [...kfs].sort((a, b) => a.time - b.time);
|
|
63
|
+
if (t <= s[0].time)
|
|
64
|
+
return s[0].value;
|
|
65
|
+
if (t >= s[s.length - 1].time)
|
|
66
|
+
return s[s.length - 1].value;
|
|
67
|
+
for (let i = 0; i < s.length - 1; i++) {
|
|
68
|
+
if (s[i].time <= t && s[i + 1].time > t) {
|
|
69
|
+
const p = s[i], n = s[i + 1];
|
|
70
|
+
if (n.easing === 'instant')
|
|
71
|
+
return p.value;
|
|
72
|
+
const frac = (t - p.time) / (n.time - p.time);
|
|
73
|
+
if (typeof p.value === 'number' && typeof n.value === 'number') {
|
|
74
|
+
return p.value + (n.value - p.value) * frac;
|
|
75
|
+
}
|
|
76
|
+
if (typeof p.value === 'object' && typeof n.value === 'object') {
|
|
77
|
+
const r = {};
|
|
78
|
+
for (const k of Object.keys(p.value)) {
|
|
79
|
+
const pv = p.value[k], nv = n.value[k];
|
|
80
|
+
r[k] = (typeof pv === 'number' && typeof nv === 'number') ? pv + (nv - pv) * frac : pv;
|
|
81
|
+
}
|
|
82
|
+
return r;
|
|
83
|
+
}
|
|
84
|
+
return p.value;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
return s[s.length - 1].value;
|
|
88
|
+
}
|
|
89
|
+
function convertOrcToRigFrames(orcFrames, fps = 12) {
|
|
90
|
+
var _a;
|
|
91
|
+
if (!orcFrames?.length)
|
|
92
|
+
return [];
|
|
93
|
+
const times = orcFrames.map(f => f.time);
|
|
94
|
+
const minT = Math.min(...times), maxT = Math.max(...times);
|
|
95
|
+
const dur = maxT - minT;
|
|
96
|
+
if (dur <= 0)
|
|
97
|
+
return [{}];
|
|
98
|
+
const byProp = {};
|
|
99
|
+
for (const kf of orcFrames)
|
|
100
|
+
(byProp[_a = kf.property] ?? (byProp[_a] = [])).push(kf);
|
|
101
|
+
const count = Math.max(1, Math.ceil(dur * fps));
|
|
102
|
+
const frames = [];
|
|
103
|
+
for (let i = 0; i <= count; i++) {
|
|
104
|
+
const t = minT + (dur * i / count);
|
|
105
|
+
const f = { rotationValues: {}, pivotPoints: {} };
|
|
106
|
+
for (const [prop, kfs] of Object.entries(byProp)) {
|
|
107
|
+
const val = interpPropAtTime(kfs, t);
|
|
108
|
+
if (prop.startsWith('joint.'))
|
|
109
|
+
f.rotationValues[prop.slice(6)] = val;
|
|
110
|
+
else if (prop.startsWith('pivotPoint.'))
|
|
111
|
+
f.pivotPoints[prop.slice(11)] = val;
|
|
112
|
+
}
|
|
113
|
+
frames.push(f);
|
|
114
|
+
}
|
|
115
|
+
return frames;
|
|
116
|
+
}
|
|
117
|
+
function resolveAnimFrames(raw) {
|
|
118
|
+
if (!raw?.length)
|
|
119
|
+
return [];
|
|
120
|
+
if (isOrcPropertyFormat(raw))
|
|
121
|
+
return convertOrcToRigFrames(raw);
|
|
122
|
+
if (isDiffBasedFormat(raw))
|
|
123
|
+
return expandDiffBasedAnimation(raw);
|
|
124
|
+
return raw;
|
|
125
|
+
}
|
|
126
|
+
export class BrowserSceneRenderer {
|
|
127
|
+
constructor(world, rigDataMap, options = {}) {
|
|
128
|
+
this.renderers = {};
|
|
129
|
+
this.resolvedAnims = {};
|
|
130
|
+
this.world = world;
|
|
131
|
+
this.rigDataMap = rigDataMap;
|
|
132
|
+
this.loadedImagesByCharacter = options.loadedImagesByCharacter || {};
|
|
133
|
+
this.backgroundColor = options.backgroundColor || DEFAULT_BACKGROUND;
|
|
134
|
+
for (const charId of Object.keys(rigDataMap)) {
|
|
135
|
+
this.renderers[charId] = new CharacterRigRenderer();
|
|
136
|
+
}
|
|
137
|
+
for (const [animId, anim] of Object.entries(this.world.animations || {})) {
|
|
138
|
+
this.resolvedAnims[animId] = resolveAnimFrames(anim.frames || []);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
async ensureImagesLoaded(charId, rigData) {
|
|
142
|
+
const renderer = this.renderers[charId];
|
|
143
|
+
const cached = this.loadedImagesByCharacter[charId] || {};
|
|
144
|
+
const missing = await renderer.getImageLoader().loadAllRigImages(rigData, true);
|
|
145
|
+
this.loadedImagesByCharacter[charId] = { ...cached, ...missing };
|
|
146
|
+
return this.loadedImagesByCharacter[charId];
|
|
147
|
+
}
|
|
148
|
+
getInterpolatedRig(charId, animId, progress, flipX, variationName) {
|
|
149
|
+
const rigData = this.rigDataMap[charId];
|
|
150
|
+
if (!rigData)
|
|
151
|
+
return {};
|
|
152
|
+
let frameRig = { ...rigData };
|
|
153
|
+
if (variationName && variationName !== 'default' && this.world.variations) {
|
|
154
|
+
const variation = this.world.variations.find((v) => {
|
|
155
|
+
const vId = (v.id || v.name || v.key || '').toString();
|
|
156
|
+
const vChar = (v.characterId || '').toString().toLowerCase();
|
|
157
|
+
return vId === variationName && vChar === charId.toLowerCase();
|
|
158
|
+
});
|
|
159
|
+
if (variation) {
|
|
160
|
+
if (variation.imagePaths) {
|
|
161
|
+
frameRig = {
|
|
162
|
+
...frameRig,
|
|
163
|
+
imagePaths: { ...frameRig.imagePaths, ...variation.imagePaths }
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
if (variation.rotationValues) {
|
|
167
|
+
frameRig = {
|
|
168
|
+
...frameRig,
|
|
169
|
+
rotationValues: { ...frameRig.rotationValues, ...variation.rotationValues }
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
if (variation.dimensionValues) {
|
|
173
|
+
frameRig = {
|
|
174
|
+
...frameRig,
|
|
175
|
+
dimensionValues: { ...frameRig.dimensionValues, ...variation.dimensionValues }
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
if (animId && this.resolvedAnims[animId]) {
|
|
181
|
+
const frames = this.resolvedAnims[animId];
|
|
182
|
+
if (frames.length > 1) {
|
|
183
|
+
const frameIdx = Math.floor(progress);
|
|
184
|
+
const frameFrac = progress - frameIdx;
|
|
185
|
+
const idx0 = frameIdx % frames.length;
|
|
186
|
+
const idx1 = (frameIdx + 1) % frames.length;
|
|
187
|
+
const startPose = frames[idx0];
|
|
188
|
+
const endPose = frames[idx1];
|
|
189
|
+
const interp = interpolatePose(startPose, endPose, frameFrac);
|
|
190
|
+
frameRig = {
|
|
191
|
+
...frameRig,
|
|
192
|
+
rotationValues: { ...frameRig.rotationValues, ...interp.rotationValues },
|
|
193
|
+
selfRotationValues: { ...frameRig.selfRotationValues, ...interp.selfRotationValues },
|
|
194
|
+
pivotPoints: { ...frameRig.pivotPoints, ...interp.pivotPoints },
|
|
195
|
+
dimensionValues: { ...frameRig.dimensionValues, ...interp.dimensionValues }
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
else if (frames.length === 1) {
|
|
199
|
+
const f = frames[0];
|
|
200
|
+
frameRig = {
|
|
201
|
+
...frameRig,
|
|
202
|
+
rotationValues: { ...frameRig.rotationValues, ...(f.rotationValues || {}) },
|
|
203
|
+
selfRotationValues: { ...frameRig.selfRotationValues, ...(f.selfRotationValues || {}) },
|
|
204
|
+
pivotPoints: { ...frameRig.pivotPoints, ...(f.pivotPoints || {}) },
|
|
205
|
+
dimensionValues: { ...frameRig.dimensionValues, ...(f.dimensionValues || {}) }
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
return { ...frameRig, flipX };
|
|
210
|
+
}
|
|
211
|
+
renderObjects(ctx, objects) {
|
|
212
|
+
for (const obj of objects) {
|
|
213
|
+
if (!obj.imageData)
|
|
214
|
+
continue;
|
|
215
|
+
ctx.save();
|
|
216
|
+
ctx.translate(obj.x, obj.y);
|
|
217
|
+
ctx.rotate(obj.rotation);
|
|
218
|
+
ctx.scale(obj.scaleX, obj.scaleY);
|
|
219
|
+
const drawX = -obj.width * obj.anchorX;
|
|
220
|
+
const drawY = -obj.height * obj.anchorY;
|
|
221
|
+
ctx.drawImage(obj.imageData, drawX, drawY, obj.width, obj.height);
|
|
222
|
+
ctx.restore();
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
async renderFrame(canvas, time) {
|
|
226
|
+
const ctx = canvas.getContext('2d');
|
|
227
|
+
if (!ctx)
|
|
228
|
+
throw new Error('Failed to get 2D context from canvas');
|
|
229
|
+
const state = evaluateScene(this.world, time);
|
|
230
|
+
const cam = state.camera;
|
|
231
|
+
const srcX = cam.x - cam.width / 2;
|
|
232
|
+
const srcY = cam.y - cam.height / 2;
|
|
233
|
+
const rootInCanvas = { x: BASE_WIDTH / 2, y: BASE_HEIGHT / 2 + 100 };
|
|
234
|
+
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
|
235
|
+
ctx.fillStyle = this.backgroundColor;
|
|
236
|
+
ctx.fillRect(0, 0, canvas.width, canvas.height);
|
|
237
|
+
ctx.save();
|
|
238
|
+
ctx.scale(canvas.width / cam.width, canvas.height / cam.height);
|
|
239
|
+
ctx.translate(-srcX, -srcY);
|
|
240
|
+
const sorted = [...state.characters].filter(c => !c.hidden).sort((a, b) => a.y - b.y);
|
|
241
|
+
for (const cs of sorted) {
|
|
242
|
+
const frameRig = this.getInterpolatedRig(cs.id, cs.animationId, cs.animationProgress, cs.flipX, cs.variationName);
|
|
243
|
+
const loadedImages = await this.ensureImagesLoaded(cs.id, frameRig);
|
|
244
|
+
const renderer = this.renderers[cs.id];
|
|
245
|
+
const rigRenderData = renderer.computeCharacterRigData(frameRig, {
|
|
246
|
+
canvasWidth: BASE_WIDTH,
|
|
247
|
+
canvasHeight: BASE_HEIGHT,
|
|
248
|
+
cameraOffset: { x: 0, y: 0 },
|
|
249
|
+
loadedImages
|
|
250
|
+
});
|
|
251
|
+
const charData = this.world.characters?.find(c => c.id === cs.id);
|
|
252
|
+
const renderScale = charData?.renderScale ?? 1.0;
|
|
253
|
+
ctx.save();
|
|
254
|
+
ctx.translate(cs.x, cs.y);
|
|
255
|
+
ctx.scale(renderScale, renderScale);
|
|
256
|
+
ctx.translate(-rootInCanvas.x, -rootInCanvas.y);
|
|
257
|
+
this.renderObjects(ctx, rigRenderData.objects);
|
|
258
|
+
ctx.restore();
|
|
259
|
+
}
|
|
260
|
+
ctx.restore();
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
//# sourceMappingURL=browserSceneRenderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browserSceneRenderer.js","sourceRoot":"","sources":["../../modules/browserSceneRenderer.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderRig.d.ts","sourceRoot":"","sources":["../../modules/renderRig.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,KAAK,EACR,OAAO,EACP,aAAa,EACb,aAAa,EAGb,QAAQ,EACR,aAAa,EAChB,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,qBAAa,oBAAoB;IAC7B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IAEnC;;;OAGG;gBACS,WAAW,CAAC,EAAE,WAAW;IAIrC;;;OAGG;IACH,cAAc,IAAI,WAAW;IAI7B;;OAEG;IACH,OAAO,CAAC,cAAc;IAYtB;;OAEG;IACH,uBAAuB,CACnB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,aAAkB,GAC5B,aAAa;IA+xChB;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM,EAAE,OAAO,SAAK,GAAG,aAAa;IA6DnG;;;;;;;;;;;;;;;;;OAiBG;IACG,MAAM,CACR,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAAC,EACnE,YAAY,GAAE,QAAyB,EACvC,eAAe,GAAE,OAAc,EAC/B,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAChC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"renderRig.d.ts","sourceRoot":"","sources":["../../modules/renderRig.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,KAAK,EACR,OAAO,EACP,aAAa,EACb,aAAa,EAGb,QAAQ,EACR,aAAa,EAChB,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,qBAAa,oBAAoB;IAC7B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IAEnC;;;OAGG;gBACS,WAAW,CAAC,EAAE,WAAW;IAIrC;;;OAGG;IACH,cAAc,IAAI,WAAW;IAI7B;;OAEG;IACH,OAAO,CAAC,cAAc;IAYtB;;OAEG;IACH,uBAAuB,CACnB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,aAAkB,GAC5B,aAAa;IA+xChB;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM,EAAE,OAAO,SAAK,GAAG,aAAa;IA6DnG;;;;;;;;;;;;;;;;;OAiBG;IACG,MAAM,CACR,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAAC,EACnE,YAAY,GAAE,QAAyB,EACvC,eAAe,GAAE,OAAc,EAC/B,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAChC,OAAO,CAAC,IAAI,CAAC;CAsFnB;AAGD,eAAO,MAAM,eAAe,sBAA6B,CAAC;AAG1D,wBAAsB,kBAAkB,CACpC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAAC,EACnE,YAAY,GAAE,QAAyB,EACvC,eAAe,GAAE,OAAe,EAChC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAChC,OAAO,CAAC,IAAI,CAAC,CAEf;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE,aAAkB,GAAG,aAAa,CAEpG"}
|
|
@@ -1286,19 +1286,11 @@ export class CharacterRigRenderer {
|
|
|
1286
1286
|
* await renderer.render(canvas, rigData);
|
|
1287
1287
|
*/
|
|
1288
1288
|
async render(canvas, rigData, loadedImages, cameraOffset = { x: 0, y: 0 }, showPivotPoints = true, options) {
|
|
1289
|
-
// If no images provided,
|
|
1289
|
+
// If no images provided, ensure this rig's required images are loaded.
|
|
1290
|
+
// A non-empty cache is not sufficient because a later variation may need
|
|
1291
|
+
// additional hashes (for example a different head image).
|
|
1290
1292
|
if (!loadedImages) {
|
|
1291
|
-
|
|
1292
|
-
// If cache is empty, load images from network
|
|
1293
|
-
if (cache.size === 0) {
|
|
1294
|
-
loadedImages = await this.imageLoader.loadAllRigImages(rigData, true);
|
|
1295
|
-
}
|
|
1296
|
-
else {
|
|
1297
|
-
loadedImages = {};
|
|
1298
|
-
cache.forEach((img, key) => {
|
|
1299
|
-
loadedImages[key] = img;
|
|
1300
|
-
});
|
|
1301
|
-
}
|
|
1293
|
+
loadedImages = await this.imageLoader.loadAllRigImages(rigData, true);
|
|
1302
1294
|
}
|
|
1303
1295
|
const ctx = canvas.getContext('2d');
|
|
1304
1296
|
if (!ctx) {
|