diff options
Diffstat (limited to 'app/client')
| -rw-r--r-- | app/client/common/player.component.js | 5 | ||||
| -rw-r--r-- | app/client/live/live.reducer.js | 2 | ||||
| -rw-r--r-- | app/client/modules/biggan/views/biggan.live.js | 39 |
3 files changed, 36 insertions, 10 deletions
diff --git a/app/client/common/player.component.js b/app/client/common/player.component.js index 546c650..6045db1 100644 --- a/app/client/common/player.component.js +++ b/app/client/common/player.component.js @@ -2,7 +2,10 @@ import { h, Component } from 'preact' import { connect } from 'react-redux' function Player(props) { - const className = props.fullscreen ? 'player fullscreen' : 'player' + let className = props.fullscreen ? 'player fullscreen' : 'player' + if (props.square) { + className += ' square' + } return ( <div className={className}> <canvas width={props.width} height={props.height} /> diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js index dfdf7ee..8112d31 100644 --- a/app/client/live/live.reducer.js +++ b/app/client/live/live.reducer.js @@ -23,9 +23,11 @@ const liveInitialState = { } const liveReducer = (state = liveInitialState, action) => { + console.log(action) let results; switch(action.type) { case types.socket.load_params: + console.log(action.opt) if (! action.opt || ! Object.keys(action.opt).length) { return state } diff --git a/app/client/modules/biggan/views/biggan.live.js b/app/client/modules/biggan/views/biggan.live.js index c583d7f..b3ad670 100644 --- a/app/client/modules/biggan/views/biggan.live.js +++ b/app/client/modules/biggan/views/biggan.live.js @@ -17,12 +17,13 @@ import * as bigganActions from '../biggan.actions' class BigGANLive extends Component { constructor(props) { super() + props.actions.live.get_params() } start(){ console.log(this.props.opt) console.log('starting up!') this.props.actions.tasks.live_task({ - folder_id: this.props.biggan.data.resultsFolder.id, + // folder_id: this.props.biggan.data.resultsFolder.id, }) } interrupt(){ @@ -37,7 +38,7 @@ class BigGANLive extends Component { <div className='app live centered'> <div className='row'> <div className='column'> - <Player width={512} height={512} fullscreen={this.props.fullscreen} /> + <Player width={512} height={512} square fullscreen={this.props.fullscreen} /> </div> <div className='params column audioParams'> <Group> @@ -53,10 +54,20 @@ class BigGANLive extends Component { onClick={() => {}} >{"Latent"}</Button> <Slider live - name='latent_update_speed' - title={"Update Speed"} + name='latent_n' + title={"Mix"} min={0} max={1} type='float' /> + <Slider live + name='latent_speed' + title={"Update Speed"} + min={0.0001} max={2} type='float' + /> + <Slider live + name='truncation' + title={"Truncation"} + min={0.0001} max={4} type='float' + /> </ParamGroup> <ParamGroup @@ -65,7 +76,7 @@ class BigGANLive extends Component { > <Slider live name='label_class_count' - title={"Classes"} + title={"Classes to mix"} min={1} max={10} type='int' /> <Button @@ -73,8 +84,13 @@ class BigGANLive extends Component { onClick={() => {}} >{"Label"}</Button> <Slider live - name='label_lerp_speed' - title={"Interpolation Speed"} + name='label_speed' + title={"Mix Speed"} + min={0} max={1} type='float' + /> + <Slider live + name='label_lerp_n' + title={"Mix"} min={0} max={1} type='float' /> </ParamGroup> @@ -98,8 +114,13 @@ class BigGANLive extends Component { onClick={() => {}} >{"Spin"}</Button> <Slider live - name='orbit_update_speed' - title={"Update Speed"} + name='orbit_lerp_speed' + title={"Noise Speed"} + min={0} max={1} type='float' + /> + <Slider live + name='orbit_lerp_n' + title={"Noise Mix"} min={0} max={1} type='float' /> </ParamGroup> |