YourWishes/domsPlace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conflict issue

Browse Source
This commit is contained in:
Dominic Masters
2018-03-10 22:42:49 +11:00
parent 370b556ed1
commit 4e547f6ed5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/components/sections/ThreeSection.jsx
View File

@ -21,8 +21,8 @@ class ThreeSection extends React.Component {
this.camera = new THREE.PerspectiveCamera(17, window.innerWidth / window.innerHeight, 0.1, 1000 ); this.camera = new THREE.PerspectiveCamera(17, window.innerWidth / window.innerHeight, 0.1, 1000 );
this.isAlive = true; this.isAlive = true;
this.render = new THREE.WebGLRenderer({canvas: this.refs.canvas, alpha: true}); this.renderer = new THREE.WebGLRenderer({canvas: this.refs.canvas, alpha: true});
this.render.setSize(window.innerWidth, window.innerHeight); this.renderer.setSize(window.innerWidth, window.innerHeight);
this.camera.position.z = 5; this.camera.position.z = 5;
@ -61,20 +61,21 @@ class ThreeSection extends React.Component {
let hfovRad = hfov * Math.PI / 180; let hfovRad = hfov * Math.PI / 180;
let vfovRad = 2*Math.atan(Math.tan(hfovRad/2)*height/width); let vfovRad = 2*Math.atan(Math.tan(hfovRad/2)*height/width);
this.render.setSize(width, height); this.renderer.setSize(width, height);
this.render.setPixelRatio(window.devicePixelRatio); this.renderer.setPixelRatio(window.devicePixelRatio);
this.camera.aspect = width / height; this.camera.aspect = width / height;
this.camera.fov = vfovRad * 180 / Math.PI; this.camera.fov = vfovRad * 180 / Math.PI;
this.camera.updateProjectionMatrix(); this.camera.updateProjectionMatrix();
requestAnimationFrame(this.onFrame.bind(this));
if(typeof this.props.onRender !== typeof undefined) { if(typeof this.props.onRender !== typeof undefined) {
this.props.onRender(diff); this.props.onRender(diff);
} }
this.render.render(this.scene, this.camera); this.renderer.render(this.scene, this.camera);
this.lastTime = now; this.lastTime = now;
requestAnimationFrame(this.onFrame.bind(this));
} }
render() { render() {