Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Seth Alves
300d35219d
move functions our of header to cpp file
2015-06-26 16:54:01 -07:00
Seth Alves
c14276145d
lock when reading or writing _actionsToAdd or _actionsToRemove
2015-06-22 07:19:40 -07:00
Seth Alves
3dcc6c9b8c
make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.
2015-06-10 12:04:44 -07:00
Seth Alves
66ab3d455f
use shared pointers to keep track of action objects
2015-06-04 12:29:05 -07:00
Seth Alves
57d85cece0
get rid of simulation back-pointer in actions
2015-06-04 09:41:32 -07:00
Seth Alves
d634663bb1
simple action is working. destructor sequense is still suspicous
2015-06-03 17:33:55 -07:00
Seth Alves
c8ab22c517
hook up entity-scripting-interface to actions
2015-06-03 11:19:45 -07:00
Seth Alves
a31a5a1554
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
2015-06-02 19:40:20 -07:00
Seth Alves
d6549948d0
first pass at entity interface to actions
2015-06-02 16:06:27 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Andrew Meadows
e61470517c
track all entities added to simulation
2015-05-06 11:01:16 -07:00
Andrew Meadows
d5f4c5a0ef
add/delete/cleanup of physical entities works
2015-05-05 10:10:08 -07:00
Andrew Meadows
3c9474b736
non-phys kinematic objs move to EntitySimulation
...
out of SimpleEntitySimulation
2015-05-01 13:43:50 -07:00
Andrew Meadows
b023fe582a
make things compile
2015-05-01 10:44:50 -07:00
Andrew Meadows
9f8b266a03
fix some compile problems
2015-04-30 13:56:37 -07:00
Andrew Meadows
c3901939e6
make some things compile after reorganization
2015-04-30 13:02:18 -07:00
Andrew Meadows
9c5f51917a
declare EntitySimulation::getEntitiesToDelete()
2015-04-29 16:26:46 -07:00
Andrew Meadows
14b6ee608a
more PhysicalEntitySimulation implementation
...
with changes to API's accordingly (does not compile yet)
2015-04-28 15:07:37 -07:00
Seth Alves
b96e455b72
uninitialized variable
2015-03-07 11:27:27 -08:00
Andrew Meadows
1c38b08e8f
remane emitEntityCollision... to entityCollision...
2015-01-21 14:07:23 -08:00
Andrew Meadows
86583f3f3f
physics collisions emit script collision events
2015-01-21 11:27:32 -08:00
Andrew Meadows
c37c1515ba
EntitySimulation is lockable
...
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
2015-01-08 10:22:25 -08:00
Andrew Meadows
fd8e3f6169
add moved entities to lists for sorting
...
and also for outgoing packet updates
2014-12-12 13:28:12 -08:00
Andrew Meadows
bc22e5723c
bundle the flags that EntitySimulation cares about
2014-12-09 12:55:58 -08:00
Andrew Meadows
7d96ad5836
cleanup of EntitySimulation API
...
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
2014-12-05 18:08:53 -08:00
Andrew Meadows
dd3a7b9b9d
EntitySimulation takes EntityItem* rather than ID
2014-11-26 12:12:43 -08:00
Andrew Meadows
0d98555740
add EntitySimulation and SimpleEntitySimulation
2014-11-24 22:29:24 -08:00
