From 497fbade9bf2db4a730dfb1a4e5f5299a00810fa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 8 Dec 2014 06:48:04 -0800 Subject: [PATCH 1/2] fix crash in entity related AC scripts --- libraries/entities/src/EntityTree.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index d3d9e2da53..5f9aa4a159 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -19,9 +19,13 @@ #include "MovingEntitiesOperator.h" #include "UpdateEntityOperator.h" -EntityTree::EntityTree(bool shouldReaverage) : Octree(shouldReaverage), _simulation(NULL) { +EntityTree::EntityTree(bool shouldReaverage) : + Octree(shouldReaverage), + _fbxService(NULL), + _lightsArePickable(true), + _simulation(NULL) +{ _rootElement = createNewElement(); - _lightsArePickable = true; // assume they are by default } EntityTree::~EntityTree() { From 0f5930a43d0281f93815ca6b49353cb87d2f0260 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 8 Dec 2014 06:50:28 -0800 Subject: [PATCH 2/2] add identifyEntity() to butterflies script --- examples/butterflies.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/butterflies.js b/examples/butterflies.js index 069a0d6792..edc33f7625 100644 --- a/examples/butterflies.js +++ b/examples/butterflies.js @@ -103,6 +103,9 @@ function updateButterflies(deltaTime) { var CHANCE_OF_IMPULSE = 0.04; for (var i = 0; i < numButterflies; i++) { if (Math.random() < CHANCE_OF_IMPULSE) { + if (!butterflies[i].isKnownID) { + butterflies[i] = Entities.identifyEntity(butterflies[i]); + } var properties = Entities.getEntityProperties(butterflies[i]); if (Vec3.length(Vec3.subtract(properties.position, flockPosition)) > range) { Entities.editEntity(butterflies[i], { position: flockPosition } );