Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:37:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed CR feedback

Browse source
This commit is contained in:
ZappoMan 2014-12-08 16:20:39 -08:00
parent 7449821a9b
commit 0d636314ba
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/collidingEntities.js
View file

@ -43,7 +43,6 @@ function draw(deltaTime) {
var properties = { var properties = {
type: "Sphere", type: "Sphere",
script: "file:///Users/zappoman/Development/HiFi/hifi/examples/entityScripts/changeColorOnCollision.js",
collisionsWillMove: true, collisionsWillMove: true,
position: startPosition, position: startPosition,
dimensions: {x: largeRadius, y: largeRadius, z: largeRadius}, dimensions: {x: largeRadius, y: largeRadius, z: largeRadius},
@ -53,7 +52,7 @@ function draw(deltaTime) {
lifetime: 20 lifetime: 20
}; };
//Entities.addEntity(properties); Entities.addEntity(properties);
numberEntitiesAdded++; numberEntitiesAdded++;
} }
@ -85,7 +84,6 @@ function draw(deltaTime) {
if (numberEntitiesAdded <= MAX_ENTITIES) { if (numberEntitiesAdded <= MAX_ENTITIES) {
var properties = { var properties = {
type: "Sphere", type: "Sphere",
script: "file:///Users/zappoman/Development/HiFi/hifi/examples/entityScripts/changeColorOnCollision.js",
collisionsWillMove: true, collisionsWillMove: true,
position: center, position: center,
dimensions: {x: entitySize, y: entitySize, z: entitySize}, dimensions: {x: entitySize, y: entitySize, z: entitySize},

7
examples/entityScripts/changeColorOnCollision.js
View file

@ -9,19 +9,12 @@
// 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
// //
print("changeColorOnCollision.js");
(function(){ (function(){
function getRandomInt(min, max) { function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min + 1)) + min; return Math.floor(Math.random() * (max - min + 1)) + min;
} }
this.preload = function(myID) {
print("changeColorOnCollision.js--- preload!!!");
};
this.collisionWithEntity = function(myID, otherID, collisionInfo) { this.collisionWithEntity = function(myID, otherID, collisionInfo) {
print("collisionWithEntity");
Entities.editEntity(myID, { color: { red: getRandomInt(128,255), green: getRandomInt(128,255), blue: getRandomInt(128,255)} }); Entities.editEntity(myID, { color: { red: getRandomInt(128,255), green: getRandomInt(128,255), blue: getRandomInt(128,255)} });
}; };
}) })