Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed dist/assets/images/thumbs/aro.jpg
Binary file not shown.
Binary file added dist/assets/images/thumbs/aro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/bespoken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed dist/assets/images/thumbs/first-to-greatness.jpg
Binary file not shown.
Binary file added dist/assets/images/thumbs/first-to-greatness.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/images/thumbs/fractal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/ica.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/jazz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed dist/assets/images/thumbs/kitchen.jpg
Binary file not shown.
Binary file added dist/assets/images/thumbs/kitchen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed dist/assets/images/thumbs/livecase.jpg
Binary file not shown.
Binary file added dist/assets/images/thumbs/livecase.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/mig.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/mnemonic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed dist/assets/images/thumbs/ndd.jpg
Binary file not shown.
Binary file added dist/assets/images/thumbs/ndd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/nokia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/nvtv.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/orchard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/osl.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/pierre.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/prh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed dist/assets/images/thumbs/race-the-sun.jpg
Binary file not shown.
Binary file added dist/assets/images/thumbs/race-the-sun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/sal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/images/thumbs/twg.png
Binary file added dist/assets/images/thumbs/typem.png
Binary file removed dist/assets/images/thumbs/ucla.jpg
Diff not rendered.
Binary file added dist/assets/images/thumbs/ucla.png
Binary file modified dist/assets/images/thumbs/view.png
Binary file modified dist/assets/images/thumbs/x2.png
25 changes: 16 additions & 9 deletions dist/content/work.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"livecase" : {
"title": "LiveCase by Google",
"thumb": "/assets/images/thumbs/livecase.jpg",
"thumb": "/assets/images/thumbs/livecase.png",
"agency": "Huge",
"role": "Lead full stack engineer",
"description": "Did it , worked on site, setup CI pipeline, loading testing and profiling, 3rd party API integrations for content moderation and companion app, 3d rendeting pipeline optimizations, custom shaders",
Expand All @@ -80,14 +80,21 @@
},
"playstation" : {
"title": "First To Greatness - PS4",
"thumb": "/assets/images/thumbs/first-to-greatness.jpg",
"thumb": "/assets/images/thumbs/first-to-greatness.png",
"agency": "",
"description": "",
"year": 2009
},
"rangerover" : {
"title": "Race The Sun",
"thumb": "/assets/images/thumbs/race-the-sun.jpg",
"thumb": "/assets/images/thumbs/race-the-sun.png",
"agency": "",
"description": "",
"year": 2009
},
"x2" : {
"title": "x2 performance",
"thumb": "/assets/images/thumbs/x2.png",
"agency": "",
"description": "",
"year": 2009
Expand Down Expand Up @@ -122,14 +129,14 @@
},
"fractals" : {
"title": "Museum Tower Wall Covering",
"thumb": "/assets/images/thumbs/fractal.jpg",
"thumb": "/assets/images/thumbs/fractal.png",
"agency": "",
"description": "",
"year": 2009
},
"newdeal" : {
"title": " New Deal Design",
"thumb": "/assets/images/thumbs/ndd.jpg",
"thumb": "/assets/images/thumbs/ndd.png",
"agency": "",
"description": "",
"year": 2009
Expand All @@ -143,21 +150,21 @@
},
"aro" : {
"title": " Architecture Research Office",
"thumb": "/assets/images/thumbs/aro.jpg",
"thumb": "/assets/images/thumbs/aro.png",
"agency": "",
"description": "",
"year": 2009
},
"kitchen" : {
"title": "The Kitchen",
"thumb": "/assets/images/thumbs/kitchen.jpg",
"thumb": "/assets/images/thumbs/kitchen.png",
"agency": "",
"description": "",
"year": 2009
},
"typem" : {
"title": "Type M",
"thumb": "/assets/images/thumbs/typem.jpg",
"thumb": "/assets/images/thumbs/typem.png",
"agency": "",
"description": "",
"year": 2009
Expand All @@ -171,7 +178,7 @@
},
"ucla" : {
"title": " UCLA Architecture & Urban Design",
"thumb": "/assets/images/thumbs/ucla.jpg",
"thumb": "/assets/images/thumbs/ucla.png",
"agency": "",
"description": "",
"year": 2009
Expand Down
17 changes: 11 additions & 6 deletions src/components/Work/Nervous.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// @flow
import { PolySynth, Synth, Frequency, FeedbackDelay } from "tone";
import { PolySynth, Synth, Frequency, FeedbackDelay, Master } from "tone";

export type NervousPoint = {|
midi: string,
pixelation: number
|};

type RandFunc = () => number;
// type Gen = () => RandFunc;

class Nervous {
notes: Array<NervousPoint>;
Expand All @@ -18,18 +19,22 @@ class Nervous {

constructor(detune: number) {
this.delay = new FeedbackDelay(0.15, 0.1).toMaster();
this.delay.wet.value = 0.2;
this.delay.wet.value = 0.1;
this.synth = new PolySynth(6, Synth, {
oscillator: {
partials: [0, 2, 3, 4]
}
}).connect(this.delay);
Master.set("volume", -6);
// this.panVol = new PanVol();
// this.synth.chain(this.delay, this.panVol, Master);

this.currentNote = "";
this.synth.set("detune", -100 * detune);
this.midiMax = 100;
this.midiMin = 36;
this.notes = this.randomWalk();
// Master.mute = true;
this.then = new Date();
}

boxMullerRandom(): RandFunc {
Expand Down Expand Up @@ -123,9 +128,9 @@ class Nervous {
}

play(note: string): void {
this.synth.triggerRelease(this.currentNote);
this.currentNote = note;
this.synth.triggerAttack(this.currentNote);
// this.synth.triggerRelease(this.currentNote);
// this.currentNote = note;
this.synth.triggerAttackRelease(note, 1, undefined, 0.5);
}

stop(): void {
Expand Down
20 changes: 18 additions & 2 deletions src/components/Work/Project.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class ProjectInner extends React.Component<WithDispatch<OwnProps>, State> {
nervous: Nervous;
blip: number;
slider: Flickity;
then: Date;
fpsInterval: number;

constructor(props: WithDispatch<OwnProps>) {
super(props);
Expand All @@ -59,6 +61,8 @@ class ProjectInner extends React.Component<WithDispatch<OwnProps>, State> {
this.state = {
showPixels: false
};
this.then = new Date();
this.fpsInterval = 1000.0 / 750.0;
}

componentDidMount() {
Expand All @@ -73,6 +77,7 @@ class ProjectInner extends React.Component<WithDispatch<OwnProps>, State> {
const transitioned: boolean =
this.props.selectedProject !== prevProps.selectedProject;
if (selected && transitioned && this.slider) this.slider.resize();
this.fpsInterval = 1000 / 10;
}

toggle() {
Expand Down Expand Up @@ -124,7 +129,9 @@ class ProjectInner extends React.Component<WithDispatch<OwnProps>, State> {
if (this.counter === 0 || this.counter === this.nervous.notes.length - 1) {
this.step = -this.step;
}
}

animate() {
// loop
if (this.play) {
if (this.props.selectedProject === this.props.projectId) {
Expand All @@ -135,8 +142,17 @@ class ProjectInner extends React.Component<WithDispatch<OwnProps>, State> {
this.nervous.stop();
return;
}
this.nervousPlay();
} else {
this.raf = window.requestAnimationFrame(this.animate.bind(this));
this.nervousPlay();
// const now = Date.now();
// const elapsed = now - this.then;
// if (elapsed > this.fpsInterval) {
// this.then = now - elapsed % this.fpsInterval;
// this.nervousPlay();
// }
}
this.raf = window.requestAnimationFrame(this.nervousPlay.bind(this));
} else {
this.nervous.stop();
window.cancelAnimationFrame(this.raf);
Expand All @@ -157,7 +173,7 @@ class ProjectInner extends React.Component<WithDispatch<OwnProps>, State> {
this.setState({ showPixels: true });
if (!this.play) {
this.play = true;
this.nervousPlay();
this.animate();
}
};

Expand Down