testing paintcan

examples/toys/cat.js

@@ -28,7 +28,6 @@
     Cat.prototype = {
 
         startTouch: function() {
-            print("START TOUCH")
             this.meow();
         }
 

examples/toys/masterResetEntity.js

@@ -33,7 +33,7 @@ function createAllToys() {
     createSprayCan({
         x: 549.8,
         y: 495.6,
-        z: 503.94
+        z: 503.84
     });
 
     createBasketBall({

examples/toys/sprayPaintCan.js

@@ -3,10 +3,9 @@
     //Need absolute path for now, for testing before PR merge and s3 cloning. Will change post-merge
 
     Script.include("../libraries/utils.js");
+    GRAB_FRAME_USER_DATA_KEY = "grabFrame";
     this.userData = {};
 
-    this.spraySound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/sprayPaintSound.wav");
-
     var TIP_OFFSET_Z = 0.14;
     var TIP_OFFSET_Y = 0.04;
 
@@ -20,17 +19,59 @@
     var MIN_POINT_DISTANCE = 0.01;
     var STROKE_WIDTH = 0.02;
 
-    this.setRightHand = function() {
-        this.hand = 'RIGHT';
+    var self = this;
+
+    var timeSinceLastMoved = 0;
+    var RESET_TIME_THRESHOLD = 5;
+    var DISTANCE_FROM_HOME_THRESHOLD = 0.5;
+    var HOME_POSITION = {
+        x: 549.12,
+        y: 495.555,
+        z: 503.77
+    };
+    this.getUserData = function() {
+
+
+        if (this.properties.userData) {
+            this.userData = JSON.parse(this.properties.userData);
+        }
     }
 
-    this.setLeftHand = function() {
-        this.hand = 'LEFT';
+    this.updateUserData = function() {
+        Entities.editEntity(this.entityId, {
+            userData: JSON.stringify(this.userData)
+        });
     }
 
-    this.startNearGrab = function() {
-        this.whichHand = this.hand;
-        var position = Entities.getEntityProperties(this.entityId, "position").position;
+    this.update = function(deltaTime) {
+        self.getUserData();
+        self.properties = Entities.getEntityProperties(self.entityId);
+
+        if (Vec3.length(self.properties.velocity) < 0.1 && Vec3.distance(HOME_POSITION, self.properties.position) > DISTANCE_FROM_HOME_THRESHOLD) {
+            timeSinceLastMoved += deltaTime;
+            if (timeSinceLastMoved > RESET_TIME_THRESHOLD) {
+                self.reset();
+                timeSinceLastMoved = 0;
+            }
+        } else {
+            timeSinceLastMoved = 0;
+        }
+
+        //Only activate for the user who grabbed the object
+        if (self.userData.grabKey && self.userData.grabKey.activated === true && self.userData.grabKey.avatarId == MyAvatar.sessionUUID) {
+            if (self.activated !== true) {
+                //We were just grabbed, so create a particle system 
+                self.grab();
+            }
+            //Move emitter to where entity is always when its activated
+            self.sprayStream();
+        } else if (self.userData.grabKey && self.userData.grabKey.activated === false && self.activated) {
+            self.letGo();
+        }
+    }
+
+    this.grab = function() {
+        this.activated = true;
         var animationSettings = JSON.stringify({
             fps: 30,
             loop: true,
@@ -44,7 +85,7 @@
         this.paintStream = Entities.addEntity({
             type: "ParticleEffect",
             animationSettings: animationSettings,
-            position: position,
+            position: this.properties.position,
             textures: "https://raw.githubusercontent.com/ericrius1/SantasLair/santa/assets/smokeparticle.png",
             emitSpeed: 0,
             speedSpread: 0.02,
@@ -59,33 +100,34 @@
             },
             lifetime: 50, //probably wont be holding longer than this straight
         });
+    }
 
-        this.sprayInjector = Audio.playSound(this.spraySound, {
-            position: position,
-            volume: 0.1
+    this.letGo = function() {
+        this.activated = false;
+        Entities.deleteEntity(this.paintStream);
+        this.paintStream = null;
+    }
+
+    this.reset = function() {
+        Entities.editEntity(self.entityId, {
+            position: HOME_POSITION,
+            rotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
+            angularVelocity: ZERO_VEC,
+            velocity: ZERO_VEC
         });
     }
 
-
-    this.releaseGrab = function() {
-        Entities.deleteEntity(this.paintStream);
-        this.paintStream = null;
-        this.painting = false;
-        this.sprayInjector.stop();
-    }
-
-
-    this.continueNearGrab = function() {
-        var props = Entities.getEntityProperties(this.entityId, ["position, rotation"]);
-        var forwardVec = Quat.getFront(Quat.multiply(props.rotation, Quat.fromPitchYawRollDegrees(0, 90, 0)));
+    this.sprayStream = function() {
+        var forwardQuat = Quat.multiply(self.properties.rotation, Quat.fromPitchYawRollDegrees(0, 90, 0));
+        var forwardVec = Quat.getFront(self.properties.rotation);
         forwardVec = Vec3.normalize(forwardVec);
 
-        var upVec = Quat.getUp(props.rotation);
-        var position = Vec3.sum(props.position, Vec3.multiply(forwardVec, TIP_OFFSET_Z));
+        var upVec = Quat.getUp(self.properties.rotation);
+        var position = Vec3.sum(self.properties.position, Vec3.multiply(forwardVec, TIP_OFFSET_Z));
         position = Vec3.sum(position, Vec3.multiply(upVec, TIP_OFFSET_Y))
-        Entities.editEntity(this.paintStream, {
-            position: position,
-            emitOrientation: forwardVec,
+        Entities.editEntity(self.paintStream, {
+            position: self.properties.position,
+            emitOrientation: self.properties.rotation,
             emitSpeed: 5
         });
 
@@ -163,11 +205,31 @@
 
     this.preload = function(entityId) {
         this.strokes = [];
+        this.activated = false;
         this.entityId = entityId;
+        this.properties = Entities.getEntityProperties(self.entityId);
+        this.getUserData();
+
+        //Only activate for the avatar who is grabbing the can!
+        if (this.userData.grabKey && this.userData.grabKey.activated) {
+            this.activated = true;
+        }
+        if (!this.userData.grabFrame) {
+            var data = {
+                relativePosition: {
+                    x: 0,
+                    y: 0,
+                    z: 0
+                },
+                relativeRotation: Quat.fromPitchYawRollDegrees(0, 0, 0)
+            }
+            setEntityCustomData(GRAB_FRAME_USER_DATA_KEY, this.entityId, data);
+        }
     }
 
 
     this.unload = function() {
+        Script.update.disconnect(this.update);
         if (this.paintStream) {
             Entities.deleteEntity(this.paintStream);
         }
@@ -175,6 +237,7 @@
             Entities.deleteEntity(stroke);
         });
     }
+    Script.update.connect(this.update);
 });
 
 
@@ -185,4 +248,26 @@ function randFloat(min, max) {
 
 function randInt(min, max) {
     return Math.floor(Math.random() * (max - min)) + min;
+}
+
+function orientationOf(vector) {
+   var Y_AXIS = {
+       x: 0,
+       y: 1,
+       z: 0
+   };
+   var X_AXIS = {
+       x: 1,
+       y: 0,
+       z: 0
+   };
+
+   var theta = 0.0;
+
+   var RAD_TO_DEG = 180.0 / Math.PI;
+   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);
 }