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

fix wedges direction

parent 21e010e8
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ async function createPolymerDirectionWedgeMesh(ctx: RuntimeContext, unit: Unit, ...@@ -73,7 +73,7 @@ async function createPolymerDirectionWedgeMesh(ctx: RuntimeContext, unit: Unit,
} }
Mat4.targetTo(t, v.p3, v.p1, upVec) Mat4.targetTo(t, v.p3, v.p1, upVec)
Mat4.mul(t, t, Mat4.rotY90) Mat4.mul(t, t, Mat4.rotY90Z180)
Mat4.scale(t, t, Vec3.set(sVec, height, width, depth)) Mat4.scale(t, t, Vec3.set(sVec, height, width, depth))
Mat4.setTranslation(t, v.p2) Mat4.setTranslation(t, v.p2)
builder.addWedge(t) builder.addWedge(t)
......
...@@ -893,6 +893,8 @@ namespace Mat4 { ...@@ -893,6 +893,8 @@ namespace Mat4 {
export const rotZYZ90: ReadonlyMat4 = Mat4.mul(Mat4.identity(), rotZY90, rotZ90) export const rotZYZ90: ReadonlyMat4 = Mat4.mul(Mat4.identity(), rotZY90, rotZ90)
/** Rotation matrix for 90deg around first z-axis and then 180deg around x-axis */ /** Rotation matrix for 90deg around first z-axis and then 180deg around x-axis */
export const rotZ90X180: ReadonlyMat4 = Mat4.mul(Mat4.identity(), rotZ90, rotX180) export const rotZ90X180: ReadonlyMat4 = Mat4.mul(Mat4.identity(), rotZ90, rotX180)
/** Rotation matrix for 90deg around first y-axis and then 180deg around z-axis */
export const rotY90Z180: ReadonlyMat4 = Mat4.mul(Mat4.identity(), rotY90, rotZ180)
} }
export default Mat4 export default Mat4
\ No newline at end of file
...@@ -98,7 +98,7 @@ export class Stage { ...@@ -98,7 +98,7 @@ export class Stage {
// this.loadPdbid('3sn6') // discontinuous chains // this.loadPdbid('3sn6') // discontinuous chains
// this.loadPdbid('2zex') // contains carbohydrate polymer // this.loadPdbid('2zex') // contains carbohydrate polymer
// this.loadPdbid('3sgj') // contains carbohydrate polymer // this.loadPdbid('3sgj') // contains carbohydrate polymer
this.loadPdbid('3ina') // contains GlcN and IdoA // this.loadPdbid('3ina') // contains GlcN and IdoA
// this.loadPdbid('1umz') // contains Xyl (Xyloglucan) // this.loadPdbid('1umz') // contains Xyl (Xyloglucan)
// this.loadPdbid('1mfb') // contains Abe // this.loadPdbid('1mfb') // contains Abe
// this.loadPdbid('2gdu') // contains sucrose // this.loadPdbid('2gdu') // contains sucrose
...@@ -106,7 +106,7 @@ export class Stage { ...@@ -106,7 +106,7 @@ export class Stage {
// this.loadPdbid('4zs9') // contains raffinose // this.loadPdbid('4zs9') // contains raffinose
// this.loadPdbid('2yft') // contains kestose // this.loadPdbid('2yft') // contains kestose
// this.loadPdbid('2b5t') // contains large carbohydrate polymer // this.loadPdbid('2b5t') // contains large carbohydrate polymer
// this.loadPdbid('1b5f') // contains carbohydrate with alternate locations this.loadPdbid('1b5f') // contains carbohydrate with alternate locations
// this.loadMmcifUrl(`../../examples/1cbs_full.bcif`) // this.loadMmcifUrl(`../../examples/1cbs_full.bcif`)
// this.loadMmcifUrl(`../../examples/1cbs_updated.cif`) // this.loadMmcifUrl(`../../examples/1cbs_updated.cif`)
// this.loadMmcifUrl(`../../examples/1crn.cif`) // this.loadMmcifUrl(`../../examples/1crn.cif`)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment