128 commits

Author	SHA1	Message	Date
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
Andrew Meadows	94c1cf12f5	deleting _dynamicsWorld doesn't crash on shutdown	2015-03-30 17:12:19 -07:00
Philip Rosedale	f116ac131d	Merge pull request #4532 from AndrewMeadows/inertia ... fix crash in PhysicsEngine on shutdown	2015-03-30 16:31:34 -07:00
Andrew Meadows	c6b34df06c	unlock after character is properly updated	2015-03-30 16:07:56 -07:00
Seth Alves	ee7247a5b4	fix a couple of crashes	2015-03-30 15:56:01 -07:00
Andrew Meadows	9b13f186e3	remove character from PhysicsEngine on shutdown	2015-03-30 15:51:58 -07:00
Seth Alves	7137b41375	free these so it's easier to see other leaks in valgrind	2015-03-30 09:30:37 -07:00
Andrew Meadows	430158c109	updateShapeIfNecessary() is a more correct name	2015-03-24 23:35:09 -07:00
Andrew Meadows	44eca08fa4	PhysicsEngine doesn't need AvatarData ... MyAvatar now owns its CharacterController fix for bug of phantom collision obj when avatar's physics are disabled	2015-03-24 17:38:35 -07:00
Andrew Meadows	6454149536	formatting and comments	2015-03-20 12:45:29 -07:00
Andrew Meadows	90a8844738	merge upstream/master into andrew/bispinor ... Conflicts: libraries/physics/src/PhysicsEngine.cpp	2015-03-19 16:18:52 -07:00
Brad Davis	91906d619f	Removing unmatched QReadWriteLock::unlock() call	2015-03-18 22:32:06 -07:00
Andrew Meadows	c032b29633	proper shape management for ConvexHull shapes	2015-03-18 16:29:57 -07:00
Seth Alves	dd97b54e52	quiet physics log spam	2015-03-18 13:22:29 -07:00
Seth Alves	2dd75fef2c	remove some unneeded Q_OBJECT macros, diff minimization	2015-03-17 19:12:26 -07:00
Seth Alves	b76103edb0	clean up debugging spew	2015-03-16 16:44:29 -07:00
Andrew Meadows	78b614f855	move avatar details into CharacterController	2015-03-16 16:24:32 -07:00
Seth Alves	59e4efa651	debugging prints around a deadlock	2015-03-15 07:10:43 -07:00
Seth Alves	250567e315	formatting, diff minimization	2015-03-14 12:09:23 -07:00