fix: fix imports of images for examples.

bhouston · Sep 15, 2020 · 932d2cc · 932d2cc
1 parent 17979d3
commit 932d2cc
Show file tree

Hide file tree

Showing 37 changed files with 62 additions and 60 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "threeify",
-  "version": "1.73.2",
+  "version": "1.73.4",
   "description": "Typescript 3D Library loosely based on three.js",
   "keywords": [
     "threeify",

diff --git a/src/examples/brdfs/clearcoat/index.ts b/src/examples/brdfs/clearcoat/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -19,8 +20,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/brdfs/lambert/index.ts b/src/examples/brdfs/lambert/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -19,8 +20,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/brdfs/sheen/index.ts b/src/examples/brdfs/sheen/index.ts
@@ -20,7 +20,7 @@ import {
   ShaderMaterial,
   transformGeometry,
   Vector3,
-} from "../../../lib";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/brdfs/specular/index.ts b/src/examples/brdfs/specular/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -19,8 +20,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/brdfs/specularAnisotropic/index.ts b/src/examples/brdfs/specularAnisotropic/index.ts
@@ -7,6 +7,7 @@ import {
   diskGeometry,
   Euler,
   EulerOrder,
+  fetchImage,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
   makeMatrix4RotationFromEuler,
@@ -19,8 +20,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/cubemaps/basic/index.ts b/src/examples/cubemaps/basic/index.ts
@@ -3,6 +3,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchCubeImages,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -15,8 +16,7 @@ import {
   RenderingContext,
   ShaderMaterial,
   Vector3,
-} from "../../../lib";
-import { fetchCubeImages } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/cubemaps/hdr/index.ts b/src/examples/cubemaps/hdr/index.ts
@@ -4,6 +4,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchCubeHDRs,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -16,8 +17,7 @@ import {
   RenderingContext,
   ShaderMaterial,
   Vector3,
-} from "../../../lib";
-import { fetchCubeHDRs } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/cubemaps/latlong/index.ts b/src/examples/cubemaps/latlong/index.ts
@@ -1,6 +1,7 @@
 import {
   DepthTestFunc,
   DepthTestState,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -14,8 +15,7 @@ import {
   Texture,
   Vector2,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/cubemaps/lod/index.ts b/src/examples/cubemaps/lod/index.ts
@@ -4,6 +4,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchCubeImages,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -16,8 +17,7 @@ import {
   RenderingContext,
   ShaderMaterial,
   Vector3,
-} from "../../../lib";
-import { fetchCubeImages } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/cubemaps/mipmaps/index.ts b/src/examples/cubemaps/mipmaps/index.ts
@@ -3,6 +3,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -15,8 +16,7 @@ import {
   RenderingContext,
   ShaderMaterial,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/cubemaps/render/index.ts b/src/examples/cubemaps/render/index.ts
@@ -5,6 +5,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchImage,
   Framebuffer,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
@@ -23,8 +24,7 @@ import {
   TextureFilter,
   Vector2,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import { patternMaterial } from "./pattern/PatternMaterial";
 import vertexSource from "./vertex.glsl";

diff --git a/src/examples/gettingstarted/animatedUniforms/index.ts b/src/examples/gettingstarted/animatedUniforms/index.ts
@@ -9,7 +9,7 @@ import {
   RenderingContext,
   ShaderMaterial,
   Vector3,
-} from "../../../lib";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/gettingstarted/interleavedBuffers/index.ts b/src/examples/gettingstarted/interleavedBuffers/index.ts
@@ -8,7 +8,7 @@ import {
   renderBufferGeometry,
   RenderingContext,
   ShaderMaterial,
-} from "../../../lib";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/gettingstarted/lambertCube/index.ts b/src/examples/gettingstarted/lambertCube/index.ts
@@ -3,6 +3,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchImage,
   makeBufferGeometryFromGeometry,
   makeMatrix4Perspective,
   makeMatrix4RotationFromEuler,
@@ -15,8 +16,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/gettingstarted/orthographic/index.ts b/src/examples/gettingstarted/orthographic/index.ts
@@ -3,6 +3,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   Euler,
+  fetchImage,
   makeBufferGeometryFromGeometry,
   makeMatrix4OrthographicSimple,
   makeMatrix4RotationFromEuler,
@@ -16,8 +17,7 @@ import {
   Texture,
   Vector2,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/gettingstarted/triangle/index.ts b/src/examples/gettingstarted/triangle/index.ts
@@ -7,7 +7,7 @@ import {
   renderBufferGeometry,
   RenderingContext,
   ShaderMaterial,
-} from "../../../lib";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/interaction/deviceOrientation/index.ts b/src/examples/interaction/deviceOrientation/index.ts
@@ -3,6 +3,7 @@ import {
   DepthTestFunc,
   DepthTestState,
   DeviceOrientation,
+  fetchImage,
   makeBufferGeometryFromGeometry,
   makeMatrix4Inverse,
   makeMatrix4Perspective,
@@ -16,8 +17,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/lights/directional/index.ts b/src/examples/lights/directional/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -19,8 +20,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/lights/multi/index.ts b/src/examples/lights/multi/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -19,8 +20,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/lights/point/index.ts b/src/examples/lights/point/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   icosahedronGeometry,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
@@ -20,8 +21,7 @@ import {
   Texture,
   Vector2,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/lights/spot/index.ts b/src/examples/lights/spot/index.ts
@@ -4,6 +4,7 @@ import {
   CullingState,
   DepthTestFunc,
   DepthTestState,
+  fetchImage,
   makeBufferGeometryFromGeometry,
   makeMatrix4PerspectiveFov,
   makeMatrix4Translation,
@@ -16,8 +17,7 @@ import {
   ShaderMaterial,
   Texture,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/materials/blending/index.ts b/src/examples/materials/blending/index.ts
@@ -3,6 +3,8 @@ import {
   blendModeToBlendState,
   BufferBit,
   ClearState,
+  fetchImage,
+  fetchImageElement,
   makeBufferGeometryFromGeometry,
   makeMatrix4Concatenation,
   makeMatrix4Scale,
@@ -17,8 +19,7 @@ import {
   Texture,
   Vector2,
   Vector3,
-} from "../../../lib";
-import { fetchImage, fetchImageElement } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";
 

diff --git a/src/examples/materials/outputs/index.ts b/src/examples/materials/outputs/index.ts
@@ -6,6 +6,7 @@ import {
   DepthTestState,
   Euler,
   EulerOrder,
+  fetchImage,
   fetchOBJ,
   makeBufferGeometryFromGeometry,
   makeMatrix4Concatenation,
@@ -24,8 +25,7 @@ import {
   transformGeometry,
   Vector2,
   Vector3,
-} from "../../../lib";
-import { fetchImage } from "../../../lib/textures/loaders";
+} from "../../../lib/index";
 import fragmentSource from "./fragment.glsl";
 import vertexSource from "./vertex.glsl";