diff --git a/src/mol-io/reader/ply/parse_data/ply_parser.ts b/src/mol-io/reader/ply/parser.ts similarity index 98% rename from src/mol-io/reader/ply/parse_data/ply_parser.ts rename to src/mol-io/reader/ply/parser.ts index e1c04a6bbc54b7217947fb0351f2eba818e22fa5..96963639992da31e8730f92294c6d5d87ab2ee41 100644 --- a/src/mol-io/reader/ply/parse_data/ply_parser.ts +++ b/src/mol-io/reader/ply/parser.ts @@ -5,11 +5,11 @@ * @author Alexander Rose <alexander.rose@weirdbyte.de> */ -import { Tokens, TokenBuilder, Tokenizer } from '../../common/text/tokenizer' -import * as Data from './data-model' -import{ ReaderResult } from '../../result' +import { Tokens, TokenBuilder, Tokenizer } from '../common/text/tokenizer' +import * as Data from './schema' +import{ ReaderResult } from '../result' import {Task, RuntimeContext, chunkedSubtask } from 'mol-task' -import { parseInt as fastParseInt, parseFloat as fastParseFloat } from '../../common/text/number-parser' +import { parseInt as fastParseInt, parseFloat as fastParseFloat } from '../common/text/number-parser' const enum PlyTokenType { Value = 0, diff --git a/src/mol-io/reader/ply/parse_data/data-model.ts b/src/mol-io/reader/ply/schema.ts similarity index 95% rename from src/mol-io/reader/ply/parse_data/data-model.ts rename to src/mol-io/reader/ply/schema.ts index 99cd4d7f2047344cb94a8eb55020c68188c2c0c1..4e4cd50552021156cf00b98bccc2de849f6dc498 100644 --- a/src/mol-io/reader/ply/parse_data/data-model.ts +++ b/src/mol-io/reader/ply/schema.ts @@ -5,7 +5,7 @@ * @author Alexander Rose <alexander.rose@weirdbyte.de> */ -import { CifField as PlyColumn } from '../../cif/data-model' +import { CifField as PlyColumn } from '../cif/data-model' export { PlyColumn } diff --git a/src/mol-model-formats/shape/ply.ts b/src/mol-model-formats/shape/ply.ts index fe32a05cdba9f9aa192863c59594011ca49e2244..97a7f41eade0b324cc42c44bdca72bca64a4c6bf 100644 --- a/src/mol-model-formats/shape/ply.ts +++ b/src/mol-model-formats/shape/ply.ts @@ -9,7 +9,7 @@ import { RuntimeContext, Task } from 'mol-task'; import { addTriangle } from 'mol-geo/geometry/mesh/builder/triangle'; import { ShapeProvider } from 'mol-model/shape/provider'; import { Color } from 'mol-util/color'; -import { PlyData, PlyFile } from 'mol-io/reader/ply/parse_data/data-model'; +import { PlyData, PlyFile } from 'mol-io/reader/ply/schema'; import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder'; import { Mesh } from 'mol-geo/geometry/mesh/mesh'; import { Shape } from 'mol-model/shape'; diff --git a/src/mol-plugin/state/objects.ts b/src/mol-plugin/state/objects.ts index 0664a86050294048dffccdf474e34e5ad2a33749..c3a0a8c979c81d6c9fc04c2fc5c3830c571774dd 100644 --- a/src/mol-plugin/state/objects.ts +++ b/src/mol-plugin/state/objects.ts @@ -6,7 +6,7 @@ */ import { CifFile } from 'mol-io/reader/cif'; -import { PlyFile } from 'mol-io/reader/ply/parse_data/data-model'; +import { PlyFile } from 'mol-io/reader/ply/schema'; import { Model as _Model, Structure as _Structure } from 'mol-model/structure'; import { VolumeData } from 'mol-model/volume'; import { PluginBehavior } from 'mol-plugin/behavior/behavior'; diff --git a/src/mol-plugin/state/transforms/data.ts b/src/mol-plugin/state/transforms/data.ts index 7481cb8e76f859808125cb079a92ae0bc9d74bc7..d41daabb9e0f91b89ffe37419dd7aa5f1977d178 100644 --- a/src/mol-plugin/state/transforms/data.ts +++ b/src/mol-plugin/state/transforms/data.ts @@ -15,7 +15,7 @@ import { StateTransformer } from 'mol-state'; import { readFromFile, ajaxGetMany } from 'mol-util/data-source'; import * as CCP4 from 'mol-io/reader/ccp4/parser' import * as DSN6 from 'mol-io/reader/dsn6/parser' -import * as PLY from 'mol-io/reader/ply/parse_data/ply_parser' +import * as PLY from 'mol-io/reader/ply/parser' export { Download } type Download = typeof Download