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
|
087d0a027d
|
merge upstream/master into andrew/nova
|
2015-04-28 10:07:49 -07:00 |
|
Andrew Meadows
|
34974272af
|
proposal for PhysicsEngine API in Application
|
2015-04-28 10:06:05 -07:00 |
|
Andrew Meadows
|
31e5758422
|
namechange updateObjectEasy()-->updateBodyEasy()
|
2015-04-27 13:04:59 -07:00 |
|
Andrew Meadows
|
72deb2e49b
|
merge upstream/master into andrew/thermonuclear
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
|
2015-04-27 12:54:21 -07:00 |
|
Seth Alves
|
e14b4c6ad4
|
cleanups
|
2015-04-27 11:01:48 -07:00 |
|
Andrew Meadows
|
e3d29d74af
|
name changes and preparation for more cleanup
|
2015-04-26 15:24:30 -07:00 |
|
Seth Alves
|
6e6793cbcc
|
remove debugging prints
|
2015-04-24 15:18:02 -07:00 |
|
Andrew Meadows
|
3ecf959b3e
|
removed cached copies of damping and restitution
|
2015-04-24 14:50:37 -07:00 |
|
Seth Alves
|
e7c6ee597a
|
sync
|
2015-04-24 14:36:05 -07:00 |
|
Seth Alves
|
ea250c037a
|
sync
|
2015-04-24 14:27:32 -07:00 |
|
Seth Alves
|
6b53fefebe
|
sync
|
2015-04-24 14:21:59 -07:00 |
|
Andrew Meadows
|
c4395e75bb
|
cleanup and comments
|
2015-04-24 13:26:26 -07:00 |
|
Seth Alves
|
6d151ee3ed
|
try a different way of identifying when to claim simulation ownership of a moving entity
|
2015-04-24 09:29:05 -07:00 |
|
Seth Alves
|
cf0499e671
|
various physics-related experiments
|
2015-04-23 21:07:04 -07:00 |
|
Seth Alves
|
2ca592de8b
|
fix logic with infectious simulation ownership
|
2015-04-23 10:02:29 -07:00 |
|
Seth Alves
|
10e5378396
|
fix mangled if
|
2015-04-23 09:13:18 -07:00 |
|
Seth Alves
|
9e96026c52
|
move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState
|
2015-04-22 21:36:36 -07:00 |
|
Seth Alves
|
4ca076ed94
|
put PhysicsEngine::bump back in. some things get missed if we just set the one thing active
|
2015-04-22 18:53:49 -07:00 |
|
Seth Alves
|
5a7f8a2f5a
|
git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table
|
2015-04-22 17:06:21 -07:00 |
|
Seth Alves
|
864f8cb3b3
|
fix comment
|
2015-04-22 16:10:25 -07:00 |
|
Seth Alves
|
96b4517e6e
|
when removing something from bullet, attempt to wake up anything that was touching it
|
2015-04-22 16:05:31 -07:00 |
|
Seth Alves
|
07a848c9ce
|
added bump call in physics engine for when an entity is deleted and may have something resting on top of it
|
2015-04-22 15:50:39 -07:00 |
|
Seth Alves
|
3450597d70
|
remove some debugging prints
|
2015-04-22 15:03:23 -07:00 |
|
Seth Alves
|
c30d742f7d
|
experimenting
|
2015-04-22 14:22:09 -07:00 |
|
Seth Alves
|
36dbbd0c9d
|
experimenting
|
2015-04-22 14:14:12 -07:00 |
|
Seth Alves
|
cd3ee39fcc
|
experimenting
|
2015-04-22 13:42:04 -07:00 |
|
Seth Alves
|
ee000f91ae
|
experimenting
|
2015-04-22 13:27:19 -07:00 |
|
Seth Alves
|
27ed0c4a98
|
experimenting
|
2015-04-22 13:21:06 -07:00 |
|
Seth Alves
|
7382b0b19f
|
experimenting
|
2015-04-22 13:17:20 -07:00 |
|
Seth Alves
|
32673efc80
|
compute collision events inside lock to avoid a rare crash
|
2015-04-22 10:51:45 -07:00 |
|
Andrew Meadows
|
65825a4501
|
Merge pull request #4659 from ericrius1/collision
Filtering triggering of collisions with contact type of "continue"
|
2015-04-22 09:33:40 -07:00 |
|
Seth Alves
|
23f1767634
|
cleanup
|
2015-04-20 16:13:28 -07:00 |
|
Seth Alves
|
d6c8bd94cf
|
clean up some debugging prints
|
2015-04-20 15:59:33 -07:00 |
|
Seth Alves
|
08d300afcd
|
use a flag to indicate that simulation ownership should be grabbed
|
2015-04-20 11:49:10 -07:00 |
|
Seth Alves
|
88f289f3c1
|
small cleanup and some debugging prints
|
2015-04-20 11:19:48 -07:00 |
|
Seth Alves
|
fbff3627dc
|
attempt to claim simulation ownership of entities the avatar crashes with
|
2015-04-20 11:13:51 -07:00 |
|
Eric Levin
|
2b4d894ab3
|
moved the type computation inside the while loop so it is correctly computed each iteration
|
2015-04-17 08:17:58 -07:00 |
|
Eric Levin
|
096f69961a
|
Filtering triggering of collisions with contact type of "continue"
|
2015-04-16 16:42:28 -07:00 |
|
Andrew Meadows
|
619d1ba191
|
rename to measureAcceleration
|
2015-04-16 14:09:33 -07:00 |
|
Andrew Meadows
|
5180e7e715
|
measure linear velocity of moving objects
|
2015-04-16 13:44:17 -07:00 |
|
Andrew Meadows
|
abb40ca080
|
cleanup: split stats dump out of stepSimulation
|
2015-04-14 09:00:36 -07:00 |
|
Andrew Meadows
|
40c94fa00e
|
merge upstream/master into andrew/isentropic
|
2015-04-07 16:23:38 -07:00 |
|
Seth Alves
|
55bab2efd6
|
put physics into its own logging group
|
2015-04-06 18:09:45 -07:00 |
|
Andrew Meadows
|
435ce106eb
|
Add DynamicCharacterController prototype
|
2015-04-06 16:03:13 -07:00 |
|
Andrew Meadows
|
27d6d9f720
|
add Bullet profiling hooks for physics simulation
|
2015-04-02 15:20:16 -07:00 |
|