From 09e9d353ead27aea0bbde5db0434738d9d876a67 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Mon, 25 May 2015 17:15:55 -0700
Subject: [PATCH] Deprecate globalCollisionsExample.js, and add
 entityCollisionExample.js

---
 examples/example/entityCollisionExample.js  | 53 +++++++++++++++++++++
 examples/example/globalCollisionsExample.js | 17 ++-----
 2 files changed, 56 insertions(+), 14 deletions(-)
 create mode 100644 examples/example/entityCollisionExample.js

diff --git a/examples/example/entityCollisionExample.js b/examples/example/entityCollisionExample.js
new file mode 100644
index 0000000000..dcbefe1378
--- /dev/null
+++ b/examples/example/entityCollisionExample.js
@@ -0,0 +1,53 @@
+//
+//  globalCollisionsExample.js
+//  examples
+//
+//  Created by Brad Hefta-Gaub on 1/29/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  This is an example script that demonstrates use of the Controller class
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+function someCollisionFunction(entityA, entityB, collision) {
+  print("collision: " + JSON.stringify({a: entityA, b: entityB, c: collision}));
+}
+
+var position = Vec3.sum(MyAvatar.position, Quat.getFront(MyAvatar.orientation));  
+var properties = {
+  type: "Box",
+  position: position,
+  collisionsWillMove: true,
+  color: { red: 200, green: 0, blue: 0 }    
+};
+var collider = Entities.addEntity(properties);
+var armed = false;
+function togglePrinting() {
+  print('togglePrinting from ' + armed + ' on ' + collider);
+  if (armed) {
+    Script.removeEventHandler(collider, "collisionWithEntity", someCollisionFunction);
+  } else {
+    Script.addEventHandler(collider, "collisionWithEntity", someCollisionFunction);
+  }
+  armed = !armed;
+  print("Red box " + (armed ? "will" : "will not") + " print on collision.");
+}
+togglePrinting();
+
+properties.position.y += 0.2;
+properties.color.blue += 200;
+// A handy target for the collider to hit.
+var target = Entities.addEntity(properties);
+
+properties.position.y += 0.2;
+properties.color.green += 200;
+var button = Entities.addEntity(properties);
+Script.addEventHandler(button, "clickReleaseOnEntity", togglePrinting);
+
+Script.scriptEnding.connect(function () {
+  Entities.deleteEntity(collider);
+  Entities.deleteEntity(target);
+  Entities.deleteEntity(button);
+});
diff --git a/examples/example/globalCollisionsExample.js b/examples/example/globalCollisionsExample.js
index 5813cb2472..99fd72696d 100644
--- a/examples/example/globalCollisionsExample.js
+++ b/examples/example/globalCollisionsExample.js
@@ -12,17 +12,6 @@
 //
 
 
-print("hello...");
-
-
-function entityCollisionWithEntity(entityA, entityB, collision) {
-    print("entityCollisionWithParticle()..");
-    print("   entityA.getID()=" + entityA.id);
-    print("   entityB.getID()=" + entityB.id);
-    Vec3.print('penetration=', collision.penetration);
-    Vec3.print('contactPoint=', collision.contactPoint);
-}
-
-Entities.entityCollisionWithEntity.connect(entityCollisionWithEntity);
-
-print("here... hello...");
+print("The is obsolete. Please instead use:");
+print("  the collisionSoundURL property on entities, or");
+print("  entityCollisionExample.js");