Skip to content
Snippets Groups Projects
Commit 42dea4a2 authored by Alexander Rose's avatar Alexander Rose
Browse files

renamed copyCage to cloneCage

parent 4de0ae66
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ export function createCage(vertices: ArrayLike<number>, edges: ArrayLike<number> ...@@ -16,7 +16,7 @@ export function createCage(vertices: ArrayLike<number>, edges: ArrayLike<number>
return { vertices, edges } return { vertices, edges }
} }
export function copyCage(cage: Cage): Cage { export function cloneCage(cage: Cage): Cage {
return { return {
vertices: new Float32Array(cage.vertices), vertices: new Float32Array(cage.vertices),
edges: new Uint32Array(cage.edges) edges: new Uint32Array(cage.edges)
......
/** /**
* Copyright (c) 2019 mol* contributors, licensed under MIT, See LICENSE file for more info. * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
* *
* @author Alexander Rose <alexander.rose@weirdbyte.de> * @author Alexander Rose <alexander.rose@weirdbyte.de>
*/ */
...@@ -8,20 +8,16 @@ import { createPrimitive, Primitive } from './primitive'; ...@@ -8,20 +8,16 @@ import { createPrimitive, Primitive } from './primitive';
import { createCage, Cage } from './cage'; import { createCage, Cage } from './cage';
export const tetrahedronVertices: ReadonlyArray<number> = [ export const tetrahedronVertices: ReadonlyArray<number> = [
0.7071, 0, 0, -0.3535, 0.6123, 0, -0.3535, -0.6123, 0, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5
0, 0, 0.7071, 0, 0, -0.7071
]; ];
export const tetrahedronIndices: ReadonlyArray<number> = [ export const tetrahedronIndices: ReadonlyArray<number> = [
4, 1, 0, 4, 2, 1, 4, 0, 2, 2, 1, 0, 0, 3, 2, 1, 3, 0, 2, 3, 1
0, 1, 3, 1, 2, 3, 2, 0, 3,
]; ];
const tetrahedronEdges: ReadonlyArray<number> = [ const tetrahedronEdges: ReadonlyArray<number> = [
0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2, 0,
0, 3, 1, 3, 2, 3, 0, 3, 1, 3, 2, 3,
0, 4, 1, 4, 2, 4,
] ]
let tetrahedron: Primitive let tetrahedron: Primitive
......
...@@ -14,11 +14,11 @@ import { Mesh } from '../../mol-geo/geometry/mesh/mesh'; ...@@ -14,11 +14,11 @@ import { Mesh } from '../../mol-geo/geometry/mesh/mesh';
import { MeshBuilder } from '../../mol-geo/geometry/mesh/mesh-builder'; import { MeshBuilder } from '../../mol-geo/geometry/mesh/mesh-builder';
import { BoxCage } from '../../mol-geo/primitive/box'; import { BoxCage } from '../../mol-geo/primitive/box';
import { Mat4, Vec3 } from '../../mol-math/linear-algebra'; import { Mat4, Vec3 } from '../../mol-math/linear-algebra';
import { transformCage, copyCage } from '../../mol-geo/primitive/cage'; import { transformCage, cloneCage } from '../../mol-geo/primitive/cage';
import { radToDeg } from '../../mol-math/misc'; import { radToDeg } from '../../mol-math/misc';
const translate05 = Mat4.fromTranslation(Mat4(), Vec3.create(0.5, 0.5, 0.5)) const translate05 = Mat4.fromTranslation(Mat4(), Vec3.create(0.5, 0.5, 0.5))
const unitCage = transformCage(copyCage(BoxCage()), translate05) const unitCage = transformCage(cloneCage(BoxCage()), translate05)
const tmpRef = Vec3() const tmpRef = Vec3()
const tmpTranslate = Mat4() const tmpTranslate = Mat4()
...@@ -43,7 +43,7 @@ function getUnitcellMesh(data: UnitcellData, props: UnitcellProps, mesh?: Mesh) ...@@ -43,7 +43,7 @@ function getUnitcellMesh(data: UnitcellData, props: UnitcellProps, mesh?: Mesh)
Vec3.floor(tmpRef, data.ref) Vec3.floor(tmpRef, data.ref)
Mat4.fromTranslation(tmpTranslate, tmpRef) Mat4.fromTranslation(tmpTranslate, tmpRef)
const cellCage = transformCage(copyCage(unitCage), tmpTranslate) const cellCage = transformCage(cloneCage(unitCage), tmpTranslate)
const radius = (Math.cbrt(data.symmetry.spacegroup.cell.volume) / 300) * props.cellScale const radius = (Math.cbrt(data.symmetry.spacegroup.cell.volume) / 300) * props.cellScale
state.currentGroup = 1 state.currentGroup = 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment