Skip to content

Commit

Permalink
refactor(webgl): update imports
Browse files Browse the repository at this point in the history
  • Loading branch information
postspectacular committed Sep 6, 2020
1 parent d9699be commit 18e86e9
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion packages/webgl/src/api/model.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AttribPool } from "@thi.ng/vector-pools";
import type { IObjectOf } from "@thi.ng/api";
import { AttribPool } from "@thi.ng/vector-pools";
import type { IndexBufferSpec, IWebGLBuffer } from "./buffers";
import type { AttribBufferData, IShader, UniformValues } from "./shader";
import type { ITexture } from "./texture";
Expand Down
2 changes: 1 addition & 1 deletion packages/webgl/src/api/multipass.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AttribPool } from "@thi.ng/vector-pools";
import type { IObjectOf } from "@thi.ng/api";
import { AttribPool } from "@thi.ng/vector-pools";
import type { IFbo, IndexBufferSpec } from "./buffers";
import type { InstancingSpec, ModelAttributeSpecs, ModelSpec } from "./model";
import type {
Expand Down
2 changes: 1 addition & 1 deletion packages/webgl/src/api/shader.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { BlendEquation, BlendFunc } from "./blend";
import type {
Fn,
Fn2,
Expand All @@ -13,6 +12,7 @@ import type {
import type { Func, Sym } from "@thi.ng/shader-ast";
import type { GLSLTarget } from "@thi.ng/shader-ast-glsl";
import type { ReadonlyVec } from "@thi.ng/vectors";
import { BlendEquation, BlendFunc } from "./blend";
import type { ExtensionBehaviors } from "./ext";
import type {
GLIntVec,
Expand Down
2 changes: 1 addition & 1 deletion packages/webgl/src/draw.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { isArray } from "@thi.ng/checks";
import type { ModelSpec } from "./api/model";
import { isGL2Context } from "./checks";
import { error } from "./error";
import { bindTextures, unbindTextures } from "./texture";
import type { ModelSpec } from "./api/model";

export interface DrawFlags {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/webgl/src/matrices.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IObjectOf } from "@thi.ng/api";
import { isNumber } from "@thi.ng/checks";
import { IDENT44, mulM44, normal44, ortho } from "@thi.ng/matrices";
import type { IObjectOf } from "@thi.ng/api";
import type { ReadonlyVec } from "@thi.ng/vectors";
import type { GLMat4 } from "./api/glsl";
import type { ShaderUniforms } from "./api/shader";
Expand Down
4 changes: 2 additions & 2 deletions packages/webgl/src/shaders/lambert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import {
surfaceNormal,
transformMVP,
} from "@thi.ng/shader-ast-stdlib";
import type { Material } from "../api/material";
import type { ShaderOpts, ShaderSpec } from "../api/shader";
import { defMaterial } from "../material";
import { autoNormalMatrix2 } from "../matrices";
import { colorAttrib, positionAttrib } from "../utils";
import type { Material } from "../api/material";
import type { ShaderOpts, ShaderSpec } from "../api/shader";

export interface LambertOpts
extends ShaderOpts<Pick<Material, "ambientCol" | "diffuseCol">> {
Expand Down
4 changes: 2 additions & 2 deletions packages/webgl/src/shaders/phong.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import {
vec4,
} from "@thi.ng/shader-ast";
import { diffuseLighting, surfaceNormal } from "@thi.ng/shader-ast-stdlib";
import type { Material } from "../api/material";
import type { ShaderOpts, ShaderSpec } from "../api/shader";
import { defMaterial } from "../material";
import { autoNormalMatrix1 } from "../matrices";
import { colorAttrib, positionAttrib } from "../utils";
import type { Material } from "../api/material";
import type { ShaderOpts, ShaderSpec } from "../api/shader";

export type PhongOpts = ShaderOpts<
Pick<Material, "ambientCol" | "diffuseCol" | "specularCol">
Expand Down
2 changes: 1 addition & 1 deletion packages/webgl/src/uniforms.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Fn, Fn3, IObjectOf } from "@thi.ng/api";
import { equivArrayLike } from "@thi.ng/equiv";
import { IDENT22, IDENT33, IDENT44 } from "@thi.ng/matrices";
import { ReadonlyVec, ZERO2, ZERO3, ZERO4 } from "@thi.ng/vectors";
import type { Fn, Fn3, IObjectOf } from "@thi.ng/api";
import type { GLVec } from "./api/glsl";
import type { UniformValue } from "./api/shader";

Expand Down

0 comments on commit 18e86e9

Please sign in to comment.