Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

import { LitElement, ReactiveElement } from 'lit';
import { BlendFunction, BlendMode, Effect } from 'postprocessing';
import { $effectComposer, MVEffectComposer } from '../../effect-composer';
import { Constructor } from '../../utilities';
import { BlendModeMixin } from './blend-mode';
import { getComponentName } from '../utilities';
import { $effectComposer, MVEffectComposer } from '../../effect-composer.js';
import { Constructor } from '../../utilities.js';
import { BlendModeMixin } from './blend-mode.js';
import { getComponentName } from '../utilities.js';

export const $updateProperties = Symbol('updateProperties');
export const $effectOptions = Symbol('effectOptions');
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer-effects/src/effects/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import { KernelSize } from 'postprocessing';
import { PerspectiveCamera } from 'three';
import { clamp } from '../utilities';
import { clamp } from '../utilities.js';
import { MVEffectBase } from './mixins/effect-base.js';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {expect} from '@esm-bundle/chai';
import {ModelViewerElement} from '@google/model-viewer';

import {ColorGradeEffect, EffectComposer} from '../../model-viewer-effects.js';
import {ArraysAreEqual, assetPath, AverageHSL, CompareArrays, createModelViewerElement, rafPasses, screenshot, waitForEvent} from '../utilities';
import {ArraysAreEqual, assetPath, AverageHSL, CompareArrays, createModelViewerElement, rafPasses, screenshot, waitForEvent} from '../utilities.js';

suite('Color Grade Effect', () => {
let element: ModelViewerElement;
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer-effects/src/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

import './utilities-spec.js';
import './effect-composer-spec.js';
import './effects';
import './effects.js';
2 changes: 1 addition & 1 deletion packages/model-viewer-effects/src/test/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {ModelViewerElement} from '@google/model-viewer';
import {Renderer} from '@google/model-viewer/lib/three-components/Renderer';
import {EventDispatcher, HSL} from 'three';

import {getOwnPropertySymbolValue} from '../utilities';
import {getOwnPropertySymbolValue} from '../utilities.js';

export const timePasses = (ms: number = 0): Promise<void> =>
new Promise((resolve) => setTimeout(resolve, ms));
Expand Down
6 changes: 3 additions & 3 deletions packages/model-viewer/src/decorators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

import {ReactiveElement} from 'lit';

import {EvaluatedStyle, Intrinsics, StyleEvaluator} from './styles/evaluators';
import {parseExpressions, Unit} from './styles/parsers';
import {StyleEffector} from './styles/style-effector';
import {EvaluatedStyle, Intrinsics, StyleEvaluator} from './styles/evaluators.js';
import {parseExpressions, Unit} from './styles/parsers.js';
import {StyleEffector} from './styles/style-effector.js';

// An IntrinsicsFactory generates up-to-date intrinsics for a given ModelViewer
// element instance when it is invoked.
Expand Down
4 changes: 2 additions & 2 deletions packages/model-viewer/src/features/scene-graph.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import {GLTFExporter, GLTFExporterOptions} from 'three/examples/jsm/exporters/GL
import ModelViewerElementBase, {$needsRender, $onModelLoad, $progressTracker, $renderer, $scene} from '../model-viewer-base.js';
import {GLTF} from '../three-components/gltf-instance/gltf-defaulted.js';
import {ModelViewerGLTFInstance} from '../three-components/gltf-instance/ModelViewerGLTFInstance.js';
import GLTFExporterMaterialsVariantsExtension from '../three-components/gltf-instance/VariantMaterialExporterPlugin';
import GLTFExporterMaterialsVariantsExtension from '../three-components/gltf-instance/VariantMaterialExporterPlugin.js';
import {Constructor} from '../utilities.js';

import {Image, PBRMetallicRoughness, Sampler, TextureInfo} from './scene-graph/api.js';
import {Material} from './scene-graph/material.js';
import {$availableVariants, $materialFromPoint, $prepareVariantsForExport, $switchVariant, Model} from './scene-graph/model.js';
import {Texture as ModelViewerTexture} from './scene-graph/texture';
import {Texture as ModelViewerTexture} from './scene-graph/texture.js';



Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/styles/conversions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import {NumberNode, ZERO} from './parsers';
import {NumberNode, ZERO} from './parsers.js';

/**
* Ensures that a given number is expressed in radians. If the number is already
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/styles/evaluators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import {normalizeUnit} from './conversions';
import {normalizeUnit} from './conversions.js';
import {ExpressionNode, ExpressionTerm, FunctionNode, IdentNode, NumberNode, numberNode, OperatorNode, Percentage, Unit, ZERO} from './parsers';

export type Evaluatable<T> = Evaluator<T>|T;
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/styles/style-effector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import {ASTWalker, ExpressionNode, FunctionNode} from './parsers';
import {ASTWalker, ExpressionNode, FunctionNode} from './parsers.js';

interface AnyObserver {
observe(): void;
Expand Down
10 changes: 5 additions & 5 deletions packages/model-viewer/src/test/features/annotation-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
import {expect} from '@esm-bundle/chai';
import {Vector3} from 'three';

import {ModelViewerElement} from '../../model-viewer';
import {$needsRender, $scene, toVector3D, Vector2D, Vector3D} from '../../model-viewer-base';
import {ModelViewerElement} from '../../model-viewer.js';
import {$needsRender, $scene, toVector3D, Vector2D, Vector3D} from '../../model-viewer-base.js';
import {Hotspot} from '../../three-components/Hotspot.js';
import {ModelScene} from '../../three-components/ModelScene';
import {timePasses, waitForEvent} from '../../utilities';
import {assetPath, rafPasses} from '../helpers';
import {ModelScene} from '../../three-components/ModelScene.js';
import {timePasses, waitForEvent} from '../../utilities.js';
import {assetPath, rafPasses} from '../helpers.js';

const sceneContainsHotspot =
(scene: ModelScene, element: HTMLElement): boolean => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {PrimitiveNode} from '../../features/scene-graph/nodes/primitive-node.js'
import {$scene} from '../../model-viewer-base.js';
import {ModelViewerElement} from '../../model-viewer.js';
import {ModelViewerGLTFInstance} from '../../three-components/gltf-instance/ModelViewerGLTFInstance.js';
import {ModelScene} from '../../three-components/ModelScene';
import {ModelScene} from '../../three-components/ModelScene.js';
import {waitForEvent} from '../../utilities.js';
import {assetPath, rafPasses} from '../helpers.js';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {KTX2Loader} from 'three/examples/jsm/loaders/KTX2Loader.js';
import ModelViewerElementBase from '../model-viewer-base.js';
import {CacheEvictionPolicy} from '../utilities/cache-eviction-policy.js';

import GLTFMaterialsVariantsExtension from './gltf-instance/VariantMaterialLoaderPlugin';
import GLTFMaterialsVariantsExtension from './gltf-instance/VariantMaterialLoaderPlugin.js';
import {GLTFInstance, GLTFInstanceConstructor} from './GLTFInstance.js';

export type ProgressCallback = (progress: number) => void;
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/three-components/Shadow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {HorizontalBlurShader} from 'three/examples/jsm/shaders/HorizontalBlurSha
import {VerticalBlurShader} from 'three/examples/jsm/shaders/VerticalBlurShader.js';
import {lerp} from 'three/src/math/MathUtils.js';

import {ModelScene} from './ModelScene';
import {ModelScene} from './ModelScene.js';

export type Side = 'back'|'bottom';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

import {Material, Mesh, Object3D} from 'three';

import {VariantData} from '../../features/scene-graph/model';
import {VariantData} from '../../features/scene-graph/model.js';

import {UserDataVariantMapping} from './VariantMaterialLoaderPlugin';
import {UserDataVariantMapping} from './VariantMaterialLoaderPlugin.js';



Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/utilities/animation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import {clamp} from '../utilities';
import {clamp} from '../utilities.js';

// Adapted from https://gist.github.com/gre/1650294
export const easeInOutQuad: TimingFunction = (t: number) =>
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/utilities/debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import {WebGLRenderTarget} from 'three';

import {Renderer} from '../three-components/Renderer';
import {Renderer} from '../three-components/Renderer.js';

/**
* Debug method to save an offscreen render target to an image; filename should
Expand Down