summaryrefslogtreecommitdiffstats
path: root/o3d/samples
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 20:34:41 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 20:34:41 +0000
commit337c60f72bca57ddd93b0f08ec279b621d32313e (patch)
treeed5a423fc683b7938707155a61a1c9522bdc2678 /o3d/samples
parentae7fe7177e80bd409a1757b7421feb59973afa08 (diff)
downloadchromium_src-337c60f72bca57ddd93b0f08ec279b621d32313e.zip
chromium_src-337c60f72bca57ddd93b0f08ec279b621d32313e.tar.gz
chromium_src-337c60f72bca57ddd93b0f08ec279b621d32313e.tar.bz2
Fix scrollwheel in beachdemo
Review URL: http://codereview.chromium.org/149139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples')
-rw-r--r--o3d/samples/beachdemo/beachdemo.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/samples/beachdemo/beachdemo.js b/o3d/samples/beachdemo/beachdemo.js
index 69bd455..e7d2dae 100644
--- a/o3d/samples/beachdemo/beachdemo.js
+++ b/o3d/samples/beachdemo/beachdemo.js
@@ -425,7 +425,7 @@ function onWheel(e) {
target = g_camera.maxFieldOfView;
}
- g_camera.fieldOfView = g_math.lerpVector(target, g_camera.fieldOfView, 0.9);
+ g_camera.fieldOfView = g_math.lerpScalar(target, g_camera.fieldOfView, 0.9);
updateProjection();
stopAnimatedCamera();