From a06623f6c6d1b750f14d1a72d0d9db026b51d891 Mon Sep 17 00:00:00 2001 From: Alexander Rose <alex.rose@rcsb.org> Date: Fri, 29 Jun 2018 15:52:26 -0700 Subject: [PATCH] imports cleanup --- src/mol-geo/representation/structure/visual/element-sphere.ts | 4 ++-- .../structure/visual/polymer-backbone-cylinder.ts | 2 +- .../representation/structure/visual/polymer-trace-mesh.ts | 4 ++-- src/mol-gl/renderable/mesh.ts | 2 +- src/mol-gl/renderable/point.ts | 2 +- src/mol-task/task.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mol-geo/representation/structure/visual/element-sphere.ts b/src/mol-geo/representation/structure/visual/element-sphere.ts index 7d6fbcbfd..55002bfc9 100644 --- a/src/mol-geo/representation/structure/visual/element-sphere.ts +++ b/src/mol-geo/representation/structure/visual/element-sphere.ts @@ -11,8 +11,8 @@ import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object' import { Unit } from 'mol-model/structure'; import { DefaultStructureProps, UnitsVisual } from '../index'; import { RuntimeContext } from 'mol-task' -import { createTransforms, createColors } from '../visual/util/common'; -import { createElementSphereMesh, markElement, getElementRadius, getElementLoci } from '../visual/util/element'; +import { createTransforms, createColors } from './util/common'; +import { createElementSphereMesh, markElement, getElementRadius, getElementLoci } from './util/element'; import { deepEqual } from 'mol-util'; import { MeshValues } from 'mol-gl/renderable'; import { getMeshData } from '../../../util/mesh-data'; diff --git a/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts b/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts index 9068225e5..1237923f8 100644 --- a/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts +++ b/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts @@ -10,7 +10,7 @@ import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object' import { Unit, Element, StructureProperties } from 'mol-model/structure'; import { DefaultStructureProps, UnitsVisual } from '../index'; import { RuntimeContext } from 'mol-task' -import { createTransforms, createColors } from '../visual/util/common'; +import { createTransforms, createColors } from './util/common'; import { deepEqual } from 'mol-util'; import { MeshValues } from 'mol-gl/renderable'; import { getMeshData } from '../../../util/mesh-data'; diff --git a/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts b/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts index 6922d4a3b..c5fa69d17 100644 --- a/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts +++ b/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts @@ -10,8 +10,8 @@ import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object' import { Unit, Element, StructureProperties } from 'mol-model/structure'; import { DefaultStructureProps, UnitsVisual } from '../index'; import { RuntimeContext } from 'mol-task' -import { createTransforms, createColors } from '../visual/util/common'; -import { markElement } from '../visual/util/element'; +import { createTransforms, createColors } from './util/common'; +import { markElement } from './util/element'; import { deepEqual } from 'mol-util'; import { MeshValues } from 'mol-gl/renderable'; import { getMeshData } from '../../../util/mesh-data'; diff --git a/src/mol-gl/renderable/mesh.ts b/src/mol-gl/renderable/mesh.ts index 562daec70..e18b88dab 100644 --- a/src/mol-gl/renderable/mesh.ts +++ b/src/mol-gl/renderable/mesh.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable' import { Context } from '../webgl/context'; import { createRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, AttributeSpec, ElementsSpec, DefineSpec, Values, InternalSchema } from '../renderable/schema'; +import { GlobalUniformSchema, BaseSchema, AttributeSpec, ElementsSpec, DefineSpec, Values, InternalSchema } from './schema'; import { MeshShaderCode } from '../shader-code'; import { ValueCell } from 'mol-util'; diff --git a/src/mol-gl/renderable/point.ts b/src/mol-gl/renderable/point.ts index a200d4e40..e036a809f 100644 --- a/src/mol-gl/renderable/point.ts +++ b/src/mol-gl/renderable/point.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable' import { Context } from '../webgl/context'; import { createRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, DefineSpec, Values, InternalSchema } from '../renderable/schema'; +import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, DefineSpec, Values, InternalSchema } from './schema'; import { PointShaderCode } from '../shader-code'; import { ValueCell } from 'mol-util'; diff --git a/src/mol-task/task.ts b/src/mol-task/task.ts index 92618a091..7fdf1b363 100644 --- a/src/mol-task/task.ts +++ b/src/mol-task/task.ts @@ -7,7 +7,7 @@ import { RuntimeContext } from './execution/runtime-context' import { Progress } from './execution/progress' import { ExecuteObservable, ExecuteObservableChild, ExecuteInContext } from './execution/observable'; -import { SyncRuntimeContext } from 'mol-task/execution/synchronous'; +import { SyncRuntimeContext } from './execution/synchronous'; import { idFactory } from 'mol-util/id-factory'; /** A "named function wrapper" with built in "computation tree progress tracking". */ -- GitLab