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

tweaks

parent 105218ee
No related branches found
No related tags found
No related merge requests found
...@@ -98,6 +98,8 @@ type ViewportState = { ...@@ -98,6 +98,8 @@ type ViewportState = {
noWebGl: boolean, noWebGl: boolean,
showLogo: boolean, showLogo: boolean,
aspectRatio: number, aspectRatio: number,
width: number
height: number
images: { [k: string]: ImageData } images: { [k: string]: ImageData }
info: string info: string
} }
...@@ -106,7 +108,25 @@ export class Viewport extends View<ViewportController, ViewportState, { noWebGl? ...@@ -106,7 +108,25 @@ export class Viewport extends View<ViewportController, ViewportState, { noWebGl?
private container: HTMLDivElement | null = null; private container: HTMLDivElement | null = null;
private canvas: HTMLCanvasElement | null = null; private canvas: HTMLCanvasElement | null = null;
private defaultBg = { r: 1, g: 1, b: 1 } private defaultBg = { r: 1, g: 1, b: 1 }
state: ViewportState = { noWebGl: false, showLogo: true, images: {}, aspectRatio: 1, info: '' }; state: ViewportState = {
noWebGl: false,
showLogo: true,
images: {},
aspectRatio: 1,
width: 0,
height: 0,
info: ''
};
handleResize() {
if (this.container) {
this.setState({
aspectRatio: this.container.clientWidth / this.container.clientHeight,
width: this.container.clientWidth,
height: this.container.clientHeight
})
}
}
componentDidMount() { componentDidMount() {
if (!this.canvas || !this.container || !this.controller.context.initStage(this.canvas, this.container)) { if (!this.canvas || !this.container || !this.controller.context.initStage(this.canvas, this.container)) {
...@@ -137,9 +157,8 @@ export class Viewport extends View<ViewportController, ViewportState, { noWebGl? ...@@ -137,9 +157,8 @@ export class Viewport extends View<ViewportController, ViewportState, { noWebGl?
}) })
}) })
if (this.container) { viewer.input.resize.subscribe(() => this.handleResize())
this.setState({ aspectRatio: this.container.clientWidth / this.container.clientHeight }) this.handleResize()
}
} }
componentWillUnmount() { componentWillUnmount() {
...@@ -188,7 +207,13 @@ export class Viewport extends View<ViewportController, ViewportState, { noWebGl? ...@@ -188,7 +207,13 @@ export class Viewport extends View<ViewportController, ViewportState, { noWebGl?
> >
{Object.keys(this.state.images).map(k => { {Object.keys(this.state.images).map(k => {
const imageData = this.state.images[k] const imageData = this.state.images[k]
return <ImageCanvas key={k} imageData={imageData} aspectRatio={this.state.aspectRatio} maxWidth={256} maxHeight={256} /> return <ImageCanvas
key={k}
imageData={imageData}
aspectRatio={this.state.aspectRatio}
maxWidth={this.state.width / 4}
maxHeight={this.state.height / 4}
/>
})} })}
</div> </div>
</div>; </div>;
......
...@@ -34,18 +34,23 @@ export class Stage { ...@@ -34,18 +34,23 @@ export class Stage {
} }
async initRenderer (canvas: HTMLCanvasElement, container: HTMLDivElement) { initRenderer (canvas: HTMLCanvasElement, container: HTMLDivElement) {
this.viewer = Viewer.create(canvas, container) this.viewer = Viewer.create(canvas, container)
this.viewer.animate() this.viewer.animate()
this.ctx.viewer = this.viewer this.ctx.viewer = this.viewer
this.loadPdbid('1crn') // this.loadPdbid('1crn')
this.loadMmcifUrl(`../../examples/1cbs_full.bcif`)
} }
async loadPdbid (pdbid: string) { loadMmcifUrl (url: string) {
const urlEntity = UrlEntity.ofUrl(this.ctx, `https://files.rcsb.org/download/${pdbid}.cif`) const urlEntity = UrlEntity.ofUrl(this.ctx, url)
MmcifUrlToSpacefill.apply(this.ctx, urlEntity, spacefillProps) MmcifUrlToSpacefill.apply(this.ctx, urlEntity, spacefillProps)
} }
loadPdbid (pdbid: string) {
return this.loadMmcifUrl(`https://files.rcsb.org/download/${pdbid}.cif`)
}
dispose () { dispose () {
// TODO // TODO
} }
......
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