diff --git a/examples/webgl_interactive_voxelpainter.html b/examples/webgl_interactive_voxelpainter.html index a3a5895a..247ee6b0 100644 --- a/examples/webgl_interactive_voxelpainter.html +++ b/examples/webgl_interactive_voxelpainter.html @@ -31,7 +31,7 @@ if ( ! Detector.webgl ) Detector.addGetWebGLMessage(); var container, stats; - var camera, cameraTarget, cameraPerspective, cameraOrtho, scene, renderer; + var camera, cameraTarget, scene, renderer; var projector, plane, cube; var mouse2D, mouse3D, ray, rollOveredFace, isShiftDown = false, @@ -61,16 +61,9 @@ info.innerHTML = 'three.js - voxel painter - webgl
click: add voxel, control + click: remove voxel, shift + click: rotate, save .png'; container.appendChild( info ); - cameraPerspective = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 10000 ); - cameraPerspective.position.y = 800; - - cameraOrtho = new THREE.OrthographicCamera( window.innerWidth / - 2, window.innerWidth / 2, window.innerHeight / 2, window.innerHeight / - 2, - 2000, 10000 ); - cameraOrtho.position.x = 1000; - cameraOrtho.position.y = 707.106; - cameraOrtho.position.z = 1000; - - camera = cameraPerspective; - + camera = new THREE.CombinedCamera( window.innerWidth, window.innerHeight, 45, 1, 10000, -2000, 10000 ); + camera.position.y = 800; + cameraTarget = new THREE.Vector3( 0, 0, 0 ); scene = new THREE.Scene(); @@ -82,7 +75,6 @@ rollOverMesh = new THREE.Mesh( rollOverGeo, rollOverMaterial ); scene.add( rollOverMesh ); - // cubes cubeGeo = new THREE.CubeGeometry( 50, 50, 50 ); @@ -140,10 +132,14 @@ gui.add(voxelConfig, 'orthographicProjection').onChange(function(){ if ( voxelConfig.orthographicProjection ) { - camera = cameraOrtho; + camera.toOrthographic(); + camera.position.x = 1000; + camera.position.y = 707.106; + camera.position.z = 1000; theta = 90; } else { - camera = cameraPerspective; + camera.toPerspective(); + camera.position.y = 800; } });