Seth Alves
1e858d8bc5
start on spring action
2015-06-08 14:16:03 -07:00
Seth Alves
b425cc6491
merge from upstream
2015-06-05 11:56:33 -07:00
Seth Alves
ba42b0dcc4
updateAction and deleteAction
2015-06-04 17:51:59 -07:00
Andrew Meadows
cd6bf9d461
cleanup comments
2015-06-04 16:56:14 -07:00
Seth Alves
66ab3d455f
use shared pointers to keep track of action objects
2015-06-04 12:29:05 -07:00
Seth Alves
8f19bad97d
pull argument extracting code into EntityActionInterface
2015-06-04 11:39:15 -07:00
Seth Alves
14026667f5
script interface for creating an action now takes an action-type name rather than having a different call for each action
2015-06-04 10:55: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
1d0d002222
clear out action change lists after applying them
2015-06-03 09:10:42 -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
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Andrew Meadows
461d08c0a9
merge upstream/master into andrew/bispinor
2015-05-22 11:35:02 -07:00
Andrew Meadows
0431e8da36
put avatar body in right spot, and give it mass
2015-05-22 11:08:56 -07:00
Andrew Meadows
f6721aa6eb
moved ShapeInfoUtil to be ShapeFactory
2015-05-21 15:53:16 -07:00
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Andrew Meadows
fb34a5ba84
renaming and cleanup
2015-05-13 08:44:10 -07:00
Andrew Meadows
7e9e223b3e
merge upstream/master into andrew/nova
2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Andrew Meadows
603afefaab
silence verbose no-very-helpful log message
2015-05-08 14:16:38 -07:00
Andrew Meadows
e7e4d80be5
always remove from _pendingAdds just in case
2015-05-07 15:22:58 -07:00
Andrew Meadows
f0618501dd
fix non-physical kinematic motion
...
also can set objects collisionless again
2015-05-07 11:29:42 -07:00
Andrew Meadows
fe5cfdf495
fix crash bug
...
when obj deleted but dangling pointer still on _pendingAdd
which would not be removed during getObjectsToDelete()
because backpointers had been disconnected
2015-05-07 10:28:38 -07:00
Andrew Meadows
7b1886a285
harvest outgoing changes for non-NULL entities
2015-05-06 16:01:25 -07:00
Seth Alves
129a3a82da
clear incoming flags after adding an entity to simulation. If an entity has a shape-type of none, don't keep asking it for a shape
2015-05-06 11:20:39 -07:00
Andrew Meadows
50f73602f6
cleanup PhysicalEntitySimulation::_outgoingChanges
2015-05-05 16:51:07 -07:00
Andrew Meadows
813d702fc5
fix infinite loop in while
2015-05-05 11:00:25 -07:00
Andrew Meadows
6be3cc6efb
remove debug stuff
2015-05-05 10:18:03 -07:00
Andrew Meadows
e38bfaa48c
allow for EntitityMotionState::_entity to be NULL
2015-05-05 10:09:07 -07:00
Andrew Meadows
066e36c3e7
fix crash bugs (don't reference NULL pointers)
2015-05-04 16:52:36 -07:00
Andrew Meadows
96acf96b76
entity-entity collision events emit signals again
2015-05-04 13:32:57 -07:00
Andrew Meadows
fef84730bf
remake foundation for CollisionEvents
2015-05-03 09:27:15 -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
4cb469dd79
cleanup how MotionStates are deleted from physics
...
also fixed some compile errors
removed cruft
2015-05-01 08:28:32 -07:00
Andrew Meadows
c3901939e6
make some things compile after reorganization
2015-04-30 13:02:18 -07:00
Andrew Meadows
31ab16ac62
move stuff into ObjectMotionState
2015-04-29 16:16:44 -07:00
Andrew Meadows
ab38572620
new PhysicsEngine API is mostly in place
...
doesn't compile, of course
large code movements are done
non-physical kinematics have been lost --
will readd in PhysicalEntitySimuation class
2015-04-29 09:48:02 -07:00
Andrew Meadows
c0a5753317
PhysicalEntitySimulation sends outgoing packets
2015-04-28 17:12:29 -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
Andrew Meadows
304850372e
initial implementation of PhysicalEntitySimulation
2015-04-28 10:05:10 -07:00