Skip to content

Commit

Permalink
Merge pull request #6023 from mozilla/TextComponentInGLTF
Browse files Browse the repository at this point in the history
Add text inflator to glTF
  • Loading branch information
takahirox authored May 12, 2023
2 parents 4fce43d + 75e3f71 commit d9a583a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/utils/jsx-entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ export interface ComponentData {
audioZone?: AudioZoneParams;
audioParams?: AudioSettings;
mediaFrame?: any;
text?: TextParams;
}

type OptionalParams<T> = Partial<T> | true;
Expand Down Expand Up @@ -354,7 +355,6 @@ export interface JSXComponentData extends ComponentData {
sceneRoot?: boolean;
sceneLoader?: { src: string };
object3D?: any;
text?: TextParams;
model?: ModelParams;
networkDebug?: boolean;
waypointPreview?: boolean;
Expand Down Expand Up @@ -422,7 +422,8 @@ export const commonInflators: Required<{ [K in keyof ComponentData]: InflatorFn
mirror: inflateMirror,
audioZone: inflateAudioZone,
audioParams: inflateAudioParams,
mediaFrame: inflateMediaFrame
mediaFrame: inflateMediaFrame,
text: inflateText
};

const jsxInflators: Required<{ [K in keyof JSXComponentData]: InflatorFn }> = {
Expand Down Expand Up @@ -467,7 +468,6 @@ const jsxInflators: Required<{ [K in keyof JSXComponentData]: InflatorFn }> = {
// inflators that create Object3Ds
object3D: addObject3DComponent,
slice9: inflateSlice9,
text: inflateText,
model: inflateModel,
image: inflateImage,
video: inflateVideo
Expand Down

0 comments on commit d9a583a

Please sign in to comment.