Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3711 from ctrlaltdavid/20130

Browse source 
CR for Job #20130 - Repeated inspect.js errors
This commit is contained in:
AndrewMeadows 2014-11-03 08:43:53 -08:00
commit 8d02e64804
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
examples/inspect.js
View file

@ -17,13 +17,17 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
var PI = 3.14 // No need for something more precise var PI = Math.PI;
var RAD_TO_DEG = 180.0 / PI;
var AZIMUTH_RATE = 90.0; var AZIMUTH_RATE = 90.0;
var ALTITUDE_RATE = 200.0; var ALTITUDE_RATE = 200.0;
var RADIUS_RATE = 1.0 / 100.0; var RADIUS_RATE = 1.0 / 100.0;
var PAN_RATE = 50.0; var PAN_RATE = 50.0;
var Y_AXIS = { x: 0, y: 1, z: 0 };
var X_AXIS = { x: 1, y: 0, z: 0 };
var alt = false; var alt = false;
var shift = false; var shift = false;
var control = false; var control = false;
@ -53,6 +57,18 @@ var avatarPosition;
var avatarOrientation; var avatarOrientation;
function orientationOf(vector) {
var direction,
yaw,
pitch;
direction = Vec3.normalize(vector);
yaw = Quat.angleAxis(Math.atan2(direction.x, direction.z) * RAD_TO_DEG, Y_AXIS);
pitch = Quat.angleAxis(Math.asin(-direction.y) * RAD_TO_DEG, X_AXIS);
return Quat.multiply(yaw, pitch);
}
function handleRadialMode(dx, dy) { function handleRadialMode(dx, dy) {
azimuth += dx / AZIMUTH_RATE; azimuth += dx / AZIMUTH_RATE;
radius += radius * dy * RADIUS_RATE; radius += radius * dy * RADIUS_RATE;
@ -65,6 +81,7 @@ function handleRadialMode(dx, dy) {
z: (Math.cos(altitude) * Math.sin(azimuth)) * radius }; z: (Math.cos(altitude) * Math.sin(azimuth)) * radius };
position = Vec3.sum(center, vector); position = Vec3.sum(center, vector);
Camera.setPosition(position); Camera.setPosition(position);
Camera.setOrientation(orientationOf(vector));
} }
function handleOrbitMode(dx, dy) { function handleOrbitMode(dx, dy) {
@ -82,6 +99,7 @@ function handleOrbitMode(dx, dy) {
z:(Math.cos(altitude) * Math.sin(azimuth)) * radius }; z:(Math.cos(altitude) * Math.sin(azimuth)) * radius };
position = Vec3.sum(center, vector); position = Vec3.sum(center, vector);
Camera.setPosition(position); Camera.setPosition(position);
Camera.setOrientation(orientationOf(vector));
} }
@ -96,7 +114,7 @@ function handlePanMode(dx, dy) {
position = Vec3.sum(position, dv); position = Vec3.sum(position, dv);
Camera.setPosition(position); Camera.setPosition(position);
Camera.keepLookingAt(center); Camera.setOrientation(orientationOf(vector));
} }
function saveCameraState() { function saveCameraState() {
@ -107,7 +125,6 @@ function saveCameraState() {
} }
function restoreCameraState() { function restoreCameraState() {
Camera.stopLooking();
Camera.setMode(oldMode); Camera.setMode(oldMode);
} }
@ -245,7 +262,6 @@ function mousePressEvent(event) {
azimuth = Math.atan2(vector.z, vector.x); azimuth = Math.atan2(vector.z, vector.x);
altitude = Math.asin(vector.y / Vec3.length(vector)); altitude = Math.asin(vector.y / Vec3.length(vector));
Camera.keepLookingAt(center);
print(string); print(string);
isActive = true; isActive = true;
} }