From 07d54a4d0ff24076eca97ad63db0ea1318844da1 Mon Sep 17 00:00:00 2001 From: Chris Killpack Date: Sat, 2 Jul 2011 16:04:55 -0700 Subject: [PATCH] Rename FPCamera to FirstPersonCamera. --- examples/canvas_sandbox.html | 2 +- examples/misc_sound.html | 2 +- examples/misc_ubiquity_test.html | 2 +- examples/webgl_geometry_dynamic.html | 2 +- examples/webgl_geometry_minecraft.html | 2 +- examples/webgl_geometry_minecraft_ao.html | 2 +- examples/webgl_geometry_terrain.html | 2 +- examples/webgl_geometry_terrain_fog.html | 2 +- examples/webgl_sandbox.html | 2 +- .../cameras/{FPCamera.js => FirstPersonCamera.js} | 10 +++++----- src/extras/cameras/QuakeCamera.js | 4 ++-- utils/build.py | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) rename src/extras/cameras/{FPCamera.js => FirstPersonCamera.js} (95%) diff --git a/examples/canvas_sandbox.html b/examples/canvas_sandbox.html index 77f91e1bcf..d343af07be 100644 --- a/examples/canvas_sandbox.html +++ b/examples/canvas_sandbox.html @@ -90,7 +90,7 @@ - + diff --git a/examples/misc_sound.html b/examples/misc_sound.html index d0c5b2dfd3..4ee6010d30 100644 --- a/examples/misc_sound.html +++ b/examples/misc_sound.html @@ -70,7 +70,7 @@ scene = new THREE.Scene(); scene.fog = new THREE.FogExp2( 0x000000, 0.0035 ); - camera = new THREE.FPCamera( { + camera = new THREE.FirstPersonCamera( { fov: 50, aspect: window.innerWidth / window.innerHeight, near: 1, far: 10000, movementSpeed: 70, lookSpeed: 0.05, noFly: true, lookVertical: false } ); diff --git a/examples/misc_ubiquity_test.html b/examples/misc_ubiquity_test.html index 5dc6c38375..55e4a4289a 100644 --- a/examples/misc_ubiquity_test.html +++ b/examples/misc_ubiquity_test.html @@ -91,7 +91,7 @@ - + diff --git a/examples/webgl_geometry_dynamic.html b/examples/webgl_geometry_dynamic.html index d863ab0335..28e78e8f4a 100644 --- a/examples/webgl_geometry_dynamic.html +++ b/examples/webgl_geometry_dynamic.html @@ -70,7 +70,7 @@ container = document.getElementById( 'container' ); - camera = new THREE.FPCamera( { + camera = new THREE.FirstPersonCamera( { fov: 60, aspect: window.innerWidth / window.innerHeight, near: 1, far: 20000, movementSpeed: 500, lookSpeed: 0.1, noFly: false, lookVertical: true diff --git a/examples/webgl_geometry_minecraft.html b/examples/webgl_geometry_minecraft.html index 1c42822118..53624fd942 100644 --- a/examples/webgl_geometry_minecraft.html +++ b/examples/webgl_geometry_minecraft.html @@ -75,7 +75,7 @@ container = document.getElementById( 'container' ); - camera = new THREE.FPCamera( { + camera = new THREE.FirstPersonCamera( { fov: 60, aspect: window.innerWidth / window.innerHeight, near: 1, far: 20000, movementSpeed: 1000, lookSpeed: 0.125, noFly: false, lookVertical: true diff --git a/examples/webgl_geometry_minecraft_ao.html b/examples/webgl_geometry_minecraft_ao.html index 1af59ba620..c967670057 100644 --- a/examples/webgl_geometry_minecraft_ao.html +++ b/examples/webgl_geometry_minecraft_ao.html @@ -83,7 +83,7 @@ container = document.getElementById( 'container' ); - camera = new THREE.FPCamera( { + camera = new THREE.FirstPersonCamera( { fov: 50, aspect: window.innerWidth / window.innerHeight, near: 1, far: 20000, constrainVertical: true, verticalMin: 1.1, verticalMax: 2.2, diff --git a/examples/webgl_geometry_terrain.html b/examples/webgl_geometry_terrain.html index 0d47c3879a..3c3358378f 100644 --- a/examples/webgl_geometry_terrain.html +++ b/examples/webgl_geometry_terrain.html @@ -67,7 +67,7 @@ container = document.getElementById( 'container' ); - camera = new THREE.FPCamera( { + camera = new THREE.FirstPersonCamera( { fov: 60, aspect: window.innerWidth / window.innerHeight, near: 1, far: 20000, movementSpeed: 1000, lookSpeed: 0.1, noFly: false, lookVertical: true diff --git a/examples/webgl_geometry_terrain_fog.html b/examples/webgl_geometry_terrain_fog.html index 685ec48414..3f0b5e6420 100644 --- a/examples/webgl_geometry_terrain_fog.html +++ b/examples/webgl_geometry_terrain_fog.html @@ -66,7 +66,7 @@ container = document.getElementById( 'container' ); - camera = new THREE.FPCamera( { + camera = new THREE.FirstPersonCamera( { fov: 60, aspect: window.innerWidth / window.innerHeight, near: 1, far: 10000, movementSpeed: 150, lookSpeed: 0.1, noFly: false, lookVertical: true diff --git a/examples/webgl_sandbox.html b/examples/webgl_sandbox.html index 1799c95ac1..e8f6aee1b8 100644 --- a/examples/webgl_sandbox.html +++ b/examples/webgl_sandbox.html @@ -109,7 +109,7 @@ - + diff --git a/src/extras/cameras/FPCamera.js b/src/extras/cameras/FirstPersonCamera.js similarity index 95% rename from src/extras/cameras/FPCamera.js rename to src/extras/cameras/FirstPersonCamera.js index dd3f3794e5..e3c153f9c2 100644 --- a/src/extras/cameras/FPCamera.js +++ b/src/extras/cameras/FirstPersonCamera.js @@ -30,7 +30,7 @@ * } */ -THREE.FPCamera = function ( parameters ) { +THREE.FirstPersonCamera = function ( parameters ) { THREE.Camera.call( this, parameters.fov, parameters.aspect, parameters.near, parameters.far, parameters.target ); @@ -307,12 +307,12 @@ THREE.FPCamera = function ( parameters ) { }; -THREE.FPCamera.prototype = new THREE.Camera(); -THREE.FPCamera.prototype.constructor = THREE.FPCamera; -THREE.FPCamera.prototype.supr = THREE.Camera.prototype; +THREE.FirstPersonCamera.prototype = new THREE.Camera(); +THREE.FirstPersonCamera.prototype.constructor = THREE.FirstPersonCamera; +THREE.FirstPersonCamera.prototype.supr = THREE.Camera.prototype; -THREE.FPCamera.prototype.translate = function ( distance, axis ) { +THREE.FirstPersonCamera.prototype.translate = function ( distance, axis ) { this.matrix.rotateAxis( axis ); diff --git a/src/extras/cameras/QuakeCamera.js b/src/extras/cameras/QuakeCamera.js index ff522bb52f..a0885c2bd1 100644 --- a/src/extras/cameras/QuakeCamera.js +++ b/src/extras/cameras/QuakeCamera.js @@ -1,7 +1,7 @@ /** * @author chriskillpack / http://chriskillpack.com/ * - * QuakeCamera has been renamed FPCamera. This property exists for backwards + * QuakeCamera has been renamed FirstPersonCamera. This property exists for backwards * compatibility only. */ -THREE.QuakeCamera = THREE.FPCamera; +THREE.QuakeCamera = THREE.FirstPersonCamera; diff --git a/utils/build.py b/utils/build.py index bd0120e658..7e37e29cec 100644 --- a/utils/build.py +++ b/utils/build.py @@ -89,7 +89,7 @@ EXTRAS_FILES = [ 'extras/ShaderUtils.js', 'extras/animation/AnimationHandler.js', 'extras/animation/Animation.js', -'extras/cameras/FPCamera.js', +'extras/cameras/FirstPersonCamera.js', 'extras/cameras/PathCamera.js', 'extras/cameras/FlyCamera.js', 'extras/cameras/RollCamera.js', -- GitLab