Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 20:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
James B. Pollack 2015-10-08 17:52:33 -07:00
parent ad6fdc813f
commit 772ea16c71
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
examples/toys/ping_pong_gun/createTargets.js
View file

@ -28,7 +28,7 @@ var TARGET_DIMENSIONS = {
z: 0.42 z: 0.42
}; };
var VERTICAL_SPACING =TARGET_DIMENSIONS.y+ 0.5; var VERTICAL_SPACING = TARGET_DIMENSIONS.y + 0.5;
var HORIZONTAL_SPACING = TARGET_DIMENSIONS.z + 0.5; var HORIZONTAL_SPACING = TARGET_DIMENSIONS.z + 0.5;
@ -36,9 +36,9 @@ var startPosition = {
x: 548.68, x: 548.68,
y: 497.30, y: 497.30,
z: 509.74 z: 509.74
} };
var rotation = Quat.fromPitchYawRollDegrees(0,-55.25,0); var rotation = Quat.fromPitchYawRollDegrees(0, -55.25, 0);
var targetIntervalClearer = Entities.addEntity({ var targetIntervalClearer = Entities.addEntity({
name: 'Target Interval Clearer - delete me to clear', name: 'Target Interval Clearer - delete me to clear',
@ -50,11 +50,12 @@ var targetIntervalClearer = Entities.addEntity({
green: 255, green: 255,
blue: 0 blue: 0
}, },
rotation:rotation, rotation: rotation,
visible: false, visible: false,
collisionsWillMove: false, collisionsWillMove: false,
ignoreForCollisions: true, ignoreForCollisions: true,
}) });
var targets = []; var targets = [];
var originalPositions = []; var originalPositions = [];
@ -62,19 +63,21 @@ var originalPositions = [];
function addTargets() { function addTargets() {
var i; var i;
var row = -1; var row = -1;
for (i = 0; i < NUMBER_OF_TARGETS; i++) { for (i = 0; i < NUMBER_OF_TARGETS; i++) {
if (i % TARGETS_PER_ROW === 0) { if (i % TARGETS_PER_ROW === 0) {
row++; row++;
} }
var vHat = Quat.getFront(rotation); var vHat = Quat.getFront(rotation);
var spacer = HORIZONTAL_SPACING * (i % TARGETS_PER_ROW)+(row * HORIZONTAL_SPACING / 2); var spacer = HORIZONTAL_SPACING * (i % TARGETS_PER_ROW) + (row * HORIZONTAL_SPACING / 2);
var multiplier = Vec3.multiply(spacer, vHat); var multiplier = Vec3.multiply(spacer, vHat);
var position = Vec3.sum(startPosition, multiplier); var position = Vec3.sum(startPosition, multiplier);
position.y = startPosition.y-(row*VERTICAL_SPACING); position.y = startPosition.y - (row * VERTICAL_SPACING);
originalPositions.push(position); originalPositions.push(position);
var targetProperties = { var targetProperties = {
name: 'Target', name: 'Target',
type: 'Model', type: 'Model',

8
unpublishedScripts/masterReset.js
View file

@ -368,7 +368,7 @@ MasterReset = function() {
x: 548.68, x: 548.68,
y: 497.30, y: 497.30,
z: 509.74 z: 509.74
} };
var rotation = Quat.fromPitchYawRollDegrees(0, -55.25, 0); var rotation = Quat.fromPitchYawRollDegrees(0, -55.25, 0);
@ -386,7 +386,8 @@ MasterReset = function() {
visible: false, visible: false,
collisionsWillMove: false, collisionsWillMove: false,
ignoreForCollisions: true, ignoreForCollisions: true,
}) });
var targets = []; var targets = [];
var originalPositions = []; var originalPositions = [];
@ -395,6 +396,7 @@ MasterReset = function() {
var i; var i;
var row = -1; var row = -1;
for (i = 0; i < NUMBER_OF_TARGETS; i++) { for (i = 0; i < NUMBER_OF_TARGETS; i++) {
if (i % TARGETS_PER_ROW === 0) { if (i % TARGETS_PER_ROW === 0) {
row++; row++;
} }
@ -404,7 +406,7 @@ MasterReset = function() {
var multiplier = Vec3.multiply(spacer, vHat); var multiplier = Vec3.multiply(spacer, vHat);
var position = Vec3.sum(startPosition, multiplier); var position = Vec3.sum(startPosition, multiplier);
position.y = startPosition.y - (row * VERTICAL_SPACING); position.y = startPosition.y - (row * VERTICAL_SPACING);
originalPositions.push(position); originalPositions.push(position);
var targetProperties = { var targetProperties = {