moorhen 0.8.3 → 0.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "moorhen",
3
- "version": "0.8.3",
3
+ "version": "0.8.4",
4
4
  "private": false,
5
5
  "main": "moorhen.js",
6
6
  "types": "./types/main.d.ts",
@@ -429,6 +429,22 @@ export namespace libcootApi {
429
429
  psi: number;
430
430
  is_pre_pro: boolean;
431
431
  }
432
+ type textureAsFloats = {
433
+ width: number;
434
+ height: number;
435
+ x_size: number;
436
+ y_size: number;
437
+ z_position: number;
438
+ image_data: emscriptem.vector<number>;
439
+ }
440
+ type textureAsFloatsJS = {
441
+ width: number;
442
+ height: number;
443
+ x_size: number;
444
+ y_size: number;
445
+ z_position: number;
446
+ image_data: number[];
447
+ }
432
448
  type fitLigandInfo = {
433
449
  imol: number;
434
450
  cluster_idx: number;
package/types/main.d.ts CHANGED
@@ -168,7 +168,7 @@ declare module 'moorhen' {
168
168
  module.exports.MoorhenMoleculeRepresentation = MoorhenMoleculeRepresentation
169
169
 
170
170
  class MoorhenMolecule implements _moorhen.Molecule {
171
- constructor(commandCentre: React.RefObject<_moorhen.CommandCentre>, glRef: React.RefObject<webGL.MGWebGL>, monomerLibrary: string)
171
+ constructor(commandCentre: React.RefObject<_moorhen.CommandCentre>, glRef: React.RefObject<webGL.MGWebGL>, store?: any, monomerLibrary?: string)
172
172
  transferLigandDicts(toMolecule: _moorhen.Molecule, override?: boolean): Promise<void>;
173
173
  minimizeEnergyUsingCidAnimated(cid: string, ncyc: number, nIterations: number, useRamaRestraints: boolean, ramaWeight: number, useTorsionRestraints: boolean, torsionWeight: number): Promise<void>;
174
174
  addColourRule(ruleType: string, cid: string, color: string, args: (string | number)[], isMultiColourRule?: boolean, applyColourToNonCarbonAtoms?: boolean, label?: string): void;
@@ -259,6 +259,7 @@ declare module 'moorhen' {
259
259
  excludedCids: string[];
260
260
  commandCentre: React.RefObject<_moorhen.CommandCentre>;
261
261
  glRef: React.RefObject<webGL.MGWebGL>;
262
+ store: any;
262
263
  atomsDirty: boolean;
263
264
  name: string;
264
265
  molNo: number;
@@ -301,7 +302,7 @@ declare module 'moorhen' {
301
302
  module.exports.MoorhenMolecule = MoorhenMolecule
302
303
 
303
304
  class MoorhenMap implements _moorhen.Map {
304
- constructor(commandCentre: React.RefObject<_moorhen.CommandCentre>, glRef: React.RefObject<webGL.MGWebGL>)
305
+ constructor(commandCentre: React.RefObject<_moorhen.CommandCentre>, glRef: React.RefObject<webGL.MGWebGL>, store?: any)
305
306
  exportAsGltf(): Promise<ArrayBuffer>;
306
307
  getHistogram(nBins?: number, zoomFactor?: number): Promise<libcootApi.HistogramInfoJS>;
307
308
  setMapWeight(weight?: number): Promise<_moorhen.WorkerResponse>;
@@ -337,6 +338,7 @@ declare module 'moorhen' {
337
338
  setActive(): Promise<void>;
338
339
  setupContourBuffers(objects: any[], keepCootColours?: boolean): void;
339
340
  setOtherMapForColouring(molNo: number, min?: number, max?: number): void;
341
+ store: any;
340
342
  isEM: boolean;
341
343
  suggestedContourLevel: number;
342
344
  suggestedRadius: number;
@@ -371,6 +373,7 @@ declare module 'moorhen' {
371
373
  commandCentre: React.RefObject<_moorhen.CommandCentre>,
372
374
  timeCapsuleRef: React.RefObject<_moorhen.TimeCapsule>,
373
375
  glRef: React.RefObject<webGL.MGWebGL>,
376
+ store: any,
374
377
  dispatch: (reduxStoreAction: any) => void,
375
378
  ): Promise<number>;
376
379
  module.exports = loadSessionFromJsonString;
@@ -383,6 +386,7 @@ declare module 'moorhen' {
383
386
  commandCentre: React.RefObject<_moorhen.CommandCentre>,
384
387
  timeCapsuleRef: React.RefObject<_moorhen.TimeCapsule>,
385
388
  glRef: React.RefObject<webGL.MGWebGL>,
389
+ store: any,
386
390
  dispatch: (reduxStoreAction: any) => void,
387
391
  ): Promise<number>;
388
392
  module.exports = loadSessionFromProtoMessage;
@@ -396,6 +400,7 @@ declare module 'moorhen' {
396
400
  commandCentre: React.RefObject<_moorhen.CommandCentre>,
397
401
  timeCapsuleRef: React.RefObject<_moorhen.TimeCapsule>,
398
402
  glRef: React.RefObject<webGL.MGWebGL>,
403
+ store: any,
399
404
  dispatch: (reduxStoreAction: any) => void,
400
405
  ): Promise<number>;
401
406
  module.exports = loadSessionData;
@@ -654,4 +659,52 @@ declare module 'moorhen' {
654
659
 
655
660
  function addMapList(arg0: _moorhen.Map[]): any;
656
661
  module.exports = addMapList;
662
+
663
+ function resetSceneSettings(): any;
664
+ module.exports = resetSceneSettings;
665
+
666
+ function resetBackupSettings(): any;
667
+ module.exports = resetBackupSettings;
668
+
669
+ function resetDefaultMouseSettings(): any;
670
+ module.exports = resetDefaultMouseSettings;
671
+
672
+ function resetGeneralStates(): any;
673
+ module.exports = resetGeneralStates;
674
+
675
+ function resetHoveringStates(): any;
676
+ module.exports = resetHoveringStates;
677
+
678
+ function resetLabelSettings(): any;
679
+ module.exports = resetLabelSettings;
680
+
681
+ function resetMapContourSettings(): any;
682
+ module.exports = resetMapContourSettings;
683
+
684
+ function resetMiscAppSettings(): any;
685
+ module.exports = resetMiscAppSettings;
686
+
687
+ function resetMoleculeMapUpdates(): any;
688
+ module.exports = resetMoleculeMapUpdates;
689
+
690
+ function resetRefinementSettings(): any;
691
+ module.exports = resetRefinementSettings;
692
+
693
+ function resetShortcutSettings(): any;
694
+ module.exports = resetShortcutSettings;
695
+
696
+ function resetActiveModals(): any;
697
+ module.exports = resetActiveModals;
698
+
699
+ function focusOnModal(): any;
700
+ module.exports = focusOnModal;
701
+
702
+ function unFocusModal(): any;
703
+ module.exports = unFocusModal;
704
+
705
+ function resetActivePopUps(): any;
706
+ module.exports = resetActivePopUps;
707
+
708
+ function resetSharedSession(): any;
709
+ module.exports = resetSharedSession;
657
710
  }
@@ -70,6 +70,7 @@ export namespace webGL {
70
70
  drawTextLabels(up: vec3, right: vec3) : void;
71
71
  drawTriangles(calculatingShadowMap: boolean, invMat: mat4) : void;
72
72
  drawImagesAndText(invMat: mat4) : void;
73
+ drawTexturedShapes(theMatrix: mat4) : void;
73
74
  drawTransparent(theMatrix: mat4) : void;
74
75
  bindFramebufferDrawBuffers() : void;
75
76
  GLrender(calculatingShadowMap: boolean) : mat4;
@@ -104,6 +105,7 @@ export namespace webGL {
104
105
  initTextBackgroundShaders(vertexShaderTextBackground : string, fragmentShaderTextBackground : string) : void;
105
106
  initOutlineShaders(vertexShader : string, fragmentShader : string) : void;
106
107
  initShaders(vertexShader : string, fragmentShader : string) : void;
108
+ initShadersTextured(vertexShader : string, fragmentShader : string) : void;
107
109
  initGBufferShaders(vertexShader : string, fragmentShader : string) : void;
108
110
  initGBufferShadersInstanced(vertexShader : string, fragmentShader : string) : void;
109
111
  initGBufferShadersPerfectSphere(vertexShader : string, fragmentShader : string) : void;
@@ -237,6 +239,7 @@ export namespace webGL {
237
239
  rttFramebuffer: MGWebGLFrameBuffer;
238
240
  doPerspectiveProjection: boolean;
239
241
  labelsTextCanvasTexture: TextCanvasTexture;
242
+ texturedShapes: TexturedShape[];
240
243
  currentBufferIdx: number;
241
244
  atom_span: number;
242
245
  axesColourBuffer: WebGLBuffer;
@@ -361,6 +364,7 @@ export namespace webGL {
361
364
  rttTextureDepth: WebGLTexture;
362
365
  rttDepthTexture: WebGLTexture;
363
366
  screenZ: number;
367
+ shaderProgramTextured: MGWebGLTextureQuadShader;
364
368
  shaderProgram: ShaderTriangles;
365
369
  shaderProgramGBuffers: ShaderGBuffersTriangles;
366
370
  shaderProgramGBuffersInstanced: ShaderGBuffersTrianglesInstanced;
@@ -3,6 +3,7 @@ import { emscriptem } from "./emscriptem";
3
3
  import { gemmi } from "./gemmi";
4
4
  import { webGL } from "./mgWebGL";
5
5
  import { MoorhenMolecule } from "../moorhen";
6
+ import { ToolkitStore } from "@reduxjs/toolkit/dist/configureStore";
6
7
 
7
8
  export namespace moorhen {
8
9
 
@@ -212,6 +213,7 @@ export namespace moorhen {
212
213
  excludedCids: string[];
213
214
  commandCentre: React.RefObject<CommandCentre>;
214
215
  glRef: React.RefObject<webGL.MGWebGL>;
216
+ store: ToolkitStore;
215
217
  atomsDirty: boolean;
216
218
  name: string;
217
219
  molNo: number;
@@ -463,6 +465,7 @@ export namespace moorhen {
463
465
  setupContourBuffers(objects: any[], keepCootColours?: boolean): void;
464
466
  setOtherMapForColouring(molNo: number, min?: number, max?: number): void;
465
467
  exportAsGltf(): Promise<ArrayBuffer>;
468
+ store: ToolkitStore;
466
469
  isEM: boolean;
467
470
  suggestedContourLevel: number;
468
471
  suggestedRadius: number;
@@ -584,6 +587,7 @@ export namespace moorhen {
584
587
  createBackup(keyString: string, sessionString: string): Promise<string>;
585
588
  fetchSession(includeAdditionalMapData: boolean): Promise<backupSession>;
586
589
  toggleDisableBackups(): void;
590
+ store: ToolkitStore;
587
591
  moleculesRef: React.RefObject<Molecule[]>;
588
592
  mapsRef: React.RefObject<Map[]>;
589
593
  glRef: React.RefObject<webGL.MGWebGL>;
@@ -811,7 +815,8 @@ export namespace moorhen {
811
815
  extraEditMenuItems: JSX.Element[];
812
816
  extraCalculateMenuItems: JSX.Element[];
813
817
  aceDRGInstance: AceDRGInstance | null;
814
- includeNavBarMenuNames: string[]
818
+ includeNavBarMenuNames: string[];
819
+ store: ToolkitStore;
815
820
  }
816
821
 
817
822
  interface ContainerProps extends Partial<ContainerRefs>, Partial<ContainerOptionalProps> { }