Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 17:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3918 from ZappoMan/acEntityCrash

Browse source 
Ac entity crash
This commit is contained in:
Philip Rosedale 2014-12-08 09:16:40 -08:00
commit 732b40f68c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/butterflies.js
View file

@ -103,6 +103,9 @@ function updateButterflies(deltaTime) {
var CHANCE_OF_IMPULSE = 0.04; var CHANCE_OF_IMPULSE = 0.04;
for (var i = 0; i < numButterflies; i++) { for (var i = 0; i < numButterflies; i++) {
if (Math.random() < CHANCE_OF_IMPULSE) { if (Math.random() < CHANCE_OF_IMPULSE) {
if (!butterflies[i].isKnownID) {
butterflies[i] = Entities.identifyEntity(butterflies[i]);
}
var properties = Entities.getEntityProperties(butterflies[i]); var properties = Entities.getEntityProperties(butterflies[i]);
if (Vec3.length(Vec3.subtract(properties.position, flockPosition)) > range) { if (Vec3.length(Vec3.subtract(properties.position, flockPosition)) > range) {
Entities.editEntity(butterflies[i], { position: flockPosition } ); Entities.editEntity(butterflies[i], { position: flockPosition } );

8
libraries/entities/src/EntityTree.cpp
View file

@ -19,9 +19,13 @@
#include "MovingEntitiesOperator.h" #include "MovingEntitiesOperator.h"
#include "UpdateEntityOperator.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(); _rootElement = createNewElement();
_lightsArePickable = true; // assume they are by default
} }
EntityTree::~EntityTree() { EntityTree::~EntityTree() {