From 9a860bd31a897b3bb871d87f118ab9e8899b7acb Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Sun, 6 Mar 2016 15:01:35 -0800 Subject: [PATCH] update ping pong gun model url --- .../toybox/ping_pong_gun/createPingPongGun.js | 88 +++++++++++-------- examples/toybox/ping_pong_gun/pingPongGun.js | 16 ++-- unpublishedScripts/hiddenEntityReset.js | 5 +- unpublishedScripts/masterReset.js | 4 +- 4 files changed, 64 insertions(+), 49 deletions(-) diff --git a/examples/toybox/ping_pong_gun/createPingPongGun.js b/examples/toybox/ping_pong_gun/createPingPongGun.js index d9f47eda37..4dac9e73a1 100644 --- a/examples/toybox/ping_pong_gun/createPingPongGun.js +++ b/examples/toybox/ping_pong_gun/createPingPongGun.js @@ -11,53 +11,63 @@ /*global MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */ Script.include("../../libraries/utils.js"); -var scriptURL = Script.resolvePath('pingPongGun.js'); +var scriptURL = Script.resolvePath('pingPongGun.js?' + Math.random()); -var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun.fbx' -var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun_convex.obj'; +var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx' +var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj'; var COLLISION_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/plastic_impact.L.wav'; var center = Vec3.sum(Vec3.sum(MyAvatar.position, { - x: 0, - y: 0.5, - z: 0 + x: 0, + y: 0.5, + z: 0 }), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation()))); var pingPongGun = Entities.addEntity({ - type: "Model", - modelURL: MODEL_URL, - shapeType: 'compound', - compoundShapeURL: COLLISION_HULL_URL, - script: scriptURL, - position: center, - dimensions: { - x: 0.08, - y: 0.21, - z: 0.47 + type: "Model", + modelURL: MODEL_URL, + shapeType: 'compound', + compoundShapeURL: COLLISION_HULL_URL, + script: scriptURL, + position: center, + dimensions: { + x: 0.08, + y: 0.21, + z: 0.47 + }, + dynamic: true, + collisionSoundURL: COLLISION_SOUND_URL, + userData: JSON.stringify({ + grabbableKey: { + invertSolidWhileHeld: true }, - dynamic: true, - collisionSoundURL: COLLISION_SOUND_URL, - userData: JSON.stringify({ - grabbableKey: { - invertSolidWhileHeld: true - }, - wearable:{joints:{RightHand:[{x:0.1177130937576294, - y:0.12922893464565277, - z:0.08307232707738876}, - {x:0.4934672713279724, - y:0.3605862259864807, - z:0.6394805908203125, - w:-0.4664038419723511}], - LeftHand:[{x:0.09151676297187805, - y:0.13639454543590546, - z:0.09354984760284424}, - {x:-0.19628101587295532, - y:0.6418180465698242, - z:0.2830369472503662, - w:0.6851521730422974}]}} - }) + wearable: { + joints: { + RightHand: [{ + x: 0.1177130937576294, + y: 0.12922893464565277, + z: 0.08307232707738876 + }, { + x: 0.4934672713279724, + y: 0.3605862259864807, + z: 0.6394805908203125, + w: -0.4664038419723511 + }], + LeftHand: [{ + x: 0.09151676297187805, + y: 0.13639454543590546, + z: 0.09354984760284424 + }, { + x: -0.19628101587295532, + y: 0.6418180465698242, + z: 0.2830369472503662, + w: 0.6851521730422974 + }] + } + } + }) }); function cleanUp() { - Entities.deleteEntity(pingPongGun); + Entities.deleteEntity(pingPongGun); } -Script.scriptEnding.connect(cleanUp); +Script.scriptEnding.connect(cleanUp); \ No newline at end of file diff --git a/examples/toybox/ping_pong_gun/pingPongGun.js b/examples/toybox/ping_pong_gun/pingPongGun.js index 29eb2e3057..46c555e5a1 100644 --- a/examples/toybox/ping_pong_gun/pingPongGun.js +++ b/examples/toybox/ping_pong_gun/pingPongGun.js @@ -22,7 +22,7 @@ //if the trigger value goes below this value, reload the gun. var RELOAD_THRESHOLD = 0.95; - var GUN_TIP_FWD_OFFSET =-0.35; + var GUN_TIP_FWD_OFFSET = -0.35; var GUN_TIP_UP_OFFSET = 0.040; var GUN_FORCE = 9; var BALL_RESTITUTION = 0.6; @@ -45,12 +45,12 @@ green: 255, blue: 255 }; - + var TRIGGER_CONTROLS = [ Controller.Standard.LT, Controller.Standard.RT, ]; - + PingPongGun.prototype = { hand: null, @@ -98,8 +98,8 @@ var properties = { // type: 'Model', // modelURL:PING_PONG_BALL_URL, - shapeType:'sphere', - type:'Sphere', + shapeType: 'sphere', + type: 'Sphere', color: BALL_COLOR, dimensions: BALL_DIMENSIONS, damping: BALL_LINEAR_DAMPING, @@ -126,6 +126,10 @@ Audio.playSound(this.SHOOTING_SOUND, audioProperties); }, + clickDownOnEntity: function(entityID, mouseEvent) { + this.shootBall() + }, + getGunTipPosition: function(properties) { //the tip of the gun is going to be in a different place than the center, so we move in space relative to the model to find that position var frontVector = Quat.getFront(properties.rotation); @@ -148,4 +152,4 @@ // entity scripts always need to return a newly constructed object of our type return new PingPongGun(); -}); +}); \ No newline at end of file diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index 4a64b34510..bc33d0f14e 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -1241,8 +1241,9 @@ } function createPingPongBallGun() { - var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun.fbx'; - var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun_convex.obj'; + + var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx'; + var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj'; var COLLISION_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/plastic_impact.L.wav'; var position = { x: 548.6, diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index c5669b9ac0..025a1adcca 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -720,8 +720,8 @@ MasterReset = function() { function createTargets() { - var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx'; - var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj'; + var MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.fbx'; + var COLLISION_HULL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Pingpong-Gun-New.obj'; var MINIMUM_MOVE_LENGTH = 0.05; var RESET_DISTANCE = 0.5;