From f04abbcb8f7fe00cd7e9e984bc6a60580065187a Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Tue, 21 Aug 2018 18:00:58 -0700
Subject: [PATCH] moved tube and sheet code to mesh folder
---
src/mol-geo/mesh/mesh-builder.ts | 4 ++--
src/mol-geo/{primitive => mesh}/sheet.ts | 2 +-
src/mol-geo/{primitive => mesh}/tube.ts | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename src/mol-geo/{primitive => mesh}/sheet.ts (99%)
rename src/mol-geo/{primitive => mesh}/tube.ts (100%)
diff --git a/src/mol-geo/mesh/mesh-builder.ts b/src/mol-geo/mesh/mesh-builder.ts
index c34b2ea47..b4b3b9c6a 100644
--- a/src/mol-geo/mesh/mesh-builder.ts
+++ b/src/mol-geo/mesh/mesh-builder.ts
@@ -13,8 +13,8 @@ import { Cylinder, CylinderProps } from '../primitive/cylinder';
import { Sphere, SphereProps } from '../primitive/sphere';
import { Mesh } from './mesh';
import { getNormalMatrix } from '../util';
-import { addSheet } from '../primitive/sheet';
-import { addTube } from '../primitive/tube';
+import { addSheet } from './sheet';
+import { addTube } from './tube';
import { StarProps, Star } from '../primitive/star';
import { Octahedron, PerforatedOctahedron } from '../primitive/octahedron';
import { Primitive } from '../primitive/primitive';
diff --git a/src/mol-geo/primitive/sheet.ts b/src/mol-geo/mesh/sheet.ts
similarity index 99%
rename from src/mol-geo/primitive/sheet.ts
rename to src/mol-geo/mesh/sheet.ts
index e2da5dfc0..ef60f0a45 100644
--- a/src/mol-geo/primitive/sheet.ts
+++ b/src/mol-geo/mesh/sheet.ts
@@ -7,7 +7,7 @@
import { Vec3 } from 'mol-math/linear-algebra';
import { ChunkedArray } from 'mol-data/util';
-import { MeshBuilderState } from '../mesh/mesh-builder';
+import { MeshBuilderState } from './mesh-builder';
const tA = Vec3.zero()
const tB = Vec3.zero()
diff --git a/src/mol-geo/primitive/tube.ts b/src/mol-geo/mesh/tube.ts
similarity index 100%
rename from src/mol-geo/primitive/tube.ts
rename to src/mol-geo/mesh/tube.ts
--
GitLab