Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 17:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24480 commits 74 branches 59 tags 1.2 GiB
Commit graph

758 commits

Author SHA1 Message Date
Ryan Huffman
86f7c28ee9 Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked 2015-01-27 10:24:28 -08:00
ZappoMan
83d1cc911a hacking 2015-01-26 19:38:24 -08:00
ZappoMan
02c0700db3 support for skipping forward on new edit packets from server 2015-01-26 17:25:06 -08:00
ZappoMan
81185cfe56 removed some debugging 2015-01-26 12:46:22 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
ZappoMan
73b9c06ec0 added some debugging 2015-01-26 11:13:30 -08:00
ZappoMan
f85774c687 adding some debugging 2015-01-26 09:45:33 -08:00
Andrew Meadows
eb4678659a remove EntityItem::getDistanceToBottomOfEntity() 
and also isRestingOnSurface()
 2015-01-23 15:56:44 -08:00
ZappoMan
9a0576adfb remove setting last simulated in setLastEdited() because it may cause problems 2015-01-23 15:54:26 -08:00
ZappoMan
9cc61e90f7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-01-23 15:01:35 -08:00
ZappoMan
fa485d21b7 added comment 2015-01-23 13:52:28 -08:00
ZappoMan
3c38a9eb53 add last simulated to the protocal 2015-01-23 13:32:38 -08:00
Andrew Meadows
36c20c24fe fix for velocity in units of domain size 2015-01-23 13:20:12 -08:00
Andrew Meadows
f2bcdfa2b4 update _lastSimulated for kinematic motion 2015-01-23 13:10:41 -08:00
Andrew Meadows
d173afaa70 add support for non-physical kinematic movement 2015-01-23 11:01:46 -08:00
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -08:00
ZappoMan
838a549abe debugging stutter 2015-01-22 13:31:09 -08:00
ZappoMan
14c7dc8eb9 debugging stutter 2015-01-22 13:13:18 -08:00
Andrew Meadows
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -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
Philip Rosedale
1ff90bec5d Merge pull request #4124 from AndrewMeadows/inertia 
support for simple kinematic motion
 2015-01-16 13:33:44 -08:00
Andrew Meadows
4392af3b3a Remove pre-Bullet server-side EntityItem motion 2015-01-16 09:26:43 -08:00
Andrew Meadows
3fed38793e merge andrew/origin/inertia to andrew/local/inertia 2015-01-15 17:55:51 -08:00
Andrew Meadows
250fd98fee support for simple kinematic motion 2015-01-15 17:51:01 -08:00
Brad Hefta-Gaub
89967fbe7a Merge pull request #4104 from AndrewMeadows/inertia 
store density in EntityItem instead of mass
 2015-01-14 17:17:45 -08:00
ZappoMan
ff60833129 fix ray pick of ellipsoids away from origin 2015-01-14 16:55:24 -08:00
Andrew Meadows
ccc50dd94f use density instead of mass 2015-01-14 15:47:44 -08:00
Andrew Meadows
03b8badd81 EntityItem stores density rather than mass. 2015-01-14 15:00:57 -08:00
Andrew Meadows
04b4a95ccb fix for bad cleanup (3 places) 2015-01-13 14:21:41 -08:00
Andrew Meadows
cee7a4db10 merge upstream/master into andrew/inertia 2015-01-13 14:03:27 -08:00
Andrew Meadows
dcca5d532a fix for glitchy physics updates 
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
 2015-01-13 14:00:37 -08:00
Clément Brisset
206e1e48f6 Merge pull request #4086 from huffman/std-to-qstring 
Std to qstring
 2015-01-12 16:19:28 -08:00
Andrew Meadows
7a2ecd27fd fix typo 2015-01-12 14:32:32 -08:00
Andrew Meadows
081037bc5f merge upstream/master into andrew/inertia 2015-01-12 12:34:50 -08:00
Andrew Meadows
bece05a994 entity prop defaults move to their own header 2015-01-12 11:49:31 -08:00
Andrew Meadows
89a782c55a remove functional code from inside assert 2015-01-11 13:31:37 -08:00
ZappoMan
60f55c7f3f remove important code from assert so it still runs in release build 2015-01-11 12:07:16 -08:00
Andrew Meadows
e711b86519 scale DEFAULT_DIMENSIONS correctly 
also remove a block of commented out cruft
 2015-01-10 19:07:58 -08:00
Andrew Meadows
1184f5b668 merge upstream/master into andrew/inertia 2015-01-10 12:45:14 -08:00
Andrew Meadows
25e64d619c move statics out of EntityItem 
This makes for much more readable core dumps
 2015-01-10 11:46:42 -08:00
Andrew Meadows
99e1fdd46e fix for EntityServer crash 
adding EntityItem::_element backpointer for easier add/remove logic
 2015-01-10 07:44:26 -08:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
Andrew Meadows
4946ec18b6 remove some TODO comments 2015-01-09 09:28:01 -08:00
Andrew Meadows
f8c512b690 fix deleteEntity() to actually delete result 2015-01-08 12:42:16 -08:00
Andrew Meadows
b0b2eb5d38 use exact equality for filtering dimension changes 2015-01-08 11:09: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
af9bafae87 fix typo 2015-01-07 12:48:16 -08:00
Andrew Meadows
1745548665 fix rapid attenuation of angular velocity 2015-01-07 12:42:50 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Andrew Meadows
6fb4e1f622 oops, need to update angularVelocity after damping 2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7 do not zero small velocities for non-bullet case 2015-01-05 12:01:09 -08:00
Andrew Meadows
3b7770f405 change meaning of damping to agree with bullet 
0 = no damping
1 = 100% damping

The new formula is: velocity *= (1 - damping)^dt
 2015-01-05 11:23:01 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Andrew Meadows
d032eab0de merge upstream/master into andrew/inertia 2015-01-05 09:19:37 -08:00
Atlante45
022beff569 Initialize entities' _locked and _script 2015-01-02 12:37:00 -08:00
Andrew Meadows
0d3e78fdb8 modify extrapolation behavior when bullet enabled 
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
 2014-12-31 16:32:09 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
86a9d5719b fix one more case of animaiton stutter 2014-12-30 15:12:23 -08:00
Andrew Meadows
da551a0a76 restore script change detection to what it was 2014-12-30 11:56:39 -08:00
Andrew Meadows
ba873deb49 ignore Entity updates that don't change anything 2014-12-30 11:38:24 -08:00
ZappoMan
a0ec2ddfe9 clamp frame index between 0 and 100,000 2014-12-29 21:07:04 -08:00
Andrew Meadows
97f44b64fc assert NULL EntityItem::_physicsInfo in dtor 2014-12-29 15:27:54 -08:00
Andrew Meadows
213133c705 restoring EntityTreeElement::cleanupEntities() 2014-12-29 15:19:25 -08:00
ZappoMan
49e350fab2 Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex 2014-12-29 14:01:35 -08:00
Andrew Meadows
0ec56816c0 remove unused variable cruft 2014-12-29 10:43:09 -08:00
Andrew Meadows
bef14a46ac remove commented out cruft 2014-12-29 10:41:19 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
ZappoMan
72cced12a6 guards for NULL collisions, possible fix to fountain crash 2014-12-23 11:30:32 -08:00
Andrew Meadows
dab1f026d7 simpler EntityItem::simulate() bypass for bullet 2014-12-18 13:56:18 -08:00
Andrew Meadows
85fd1fc14f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
 2014-12-18 13:46:06 -08:00
Andrew Meadows
b03e6c53e1 fixing derived classes to use new EntityItem API 
remove 'forceCopy' argument in EntityItem::setProperties()
 2014-12-18 11:41:20 -08:00
Andrew Meadows
28381a3b70 cleanup of EntityItem::_created timestamp logic 
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
 2014-12-18 11:39:02 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Andrew Meadows
756d09d895 fix typo that broke the build 2014-12-17 16:06:15 -08:00
Andrew Meadows
6e7eccdb27 merge upstream/master into andrew/thermonuclear 2014-12-17 15:59:45 -08:00
Andrew Meadows
75d468da9e set _lastEdited to _created rather than to zero 2014-12-17 15:59:16 -08:00
Andrew Meadows
44ebf37510 handle case where obj at rest but still falls 2014-12-17 15:52:34 -08:00
Andrew Meadows
1e5c44f117 accept changes with the same Edit timestamp 2014-12-17 15:48:49 -08:00
Andrew Meadows
547c4cdaf9 make non-bullet entity simulation work again 2014-12-17 14:52:38 -08:00
Andrew Meadows
6ea766b48d merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTypes.cpp
 2014-12-17 13:21:00 -08:00
Andrew Meadows
8de309a7a9 more correct _created and _lastEdited 2014-12-17 12:38:26 -08:00
Andrew Meadows
5efd996548 clarifying some comments on member variables 2014-12-17 12:37:49 -08:00
Andrew Meadows
e36ee2a961 more correct creation and edit times for entities 2014-12-17 12:19:34 -08:00
ZappoMan
a465aa20ff more Application and Menu dependency removal 2014-12-17 11:41:42 -08:00
Stephen Birarda
e0752cef54 remove collision sound creation calls 2014-12-16 15:35:37 -08:00
Stephen Birarda
6fd55e6f42 make Audio class use DependencyManager 2014-12-16 12:31:01 -08:00
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
Andrew Meadows
0f488bca02 differentiation btw _lastEdited and _lastSimulated 2014-12-15 14:28:53 -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
4c74c041c2 remove unused cruft 2014-12-10 16:59:49 -08:00
Andrew Meadows
c4d076b0bb added comments about macro behavior 2014-12-10 16:59:17 -08:00
AndrewMeadows
9aaaae6759 Merge pull request #3934 from ZappoMan/bugfixes 
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
 2014-12-09 18:08:14 -08:00
ZappoMan
426517b072 fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities 2014-12-09 17:11:01 -08:00
Andrew Meadows
bc22e5723c bundle the flags that EntitySimulation cares about 2014-12-09 12:55:58 -08:00
Andrew Meadows
699e632e68 remove EntityItem::SimulationState after bad merge 2014-12-09 12:45:21 -08:00
ZappoMan
663b9c393e add debugging 2014-12-09 12:43:34 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Andrew Meadows
d4c72ab203 handle case where EntityItem's script has changed 2014-12-08 17:16:45 -08:00
Andrew Meadows
a519775cb3 unecessary EntitySimulation::entityChanged() calls 2014-12-08 17:15:58 -08:00
Brad Hefta-Gaub
651e550063 Merge pull request #3925 from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-08 16:58:16 -08:00
Andrew Meadows
675a2dd989 add DIRTY_UPDATEABLE flag for changes that need it 2014-12-08 16:32:25 -08:00
Andrew Meadows
27bfc9907f fix bug preventing butterflies from animating 
(forgot to make base method virtual)
 2014-12-08 16:31:36 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -08:00
Andrew Meadows
3ce1d4a38d set dirty bit when script changes simulation stuff 
also fixes for linear and angular damping
 2014-12-08 11:21:01 -08:00
Andrew Meadows
6fdfde31d9 whoops, forgot to increment the iterator 2014-12-08 11:20:27 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
Philip Rosedale
7de2256744 Merge pull request #3919 from ZappoMan/enforceDimensionsForLightsAndText 
enforce dimensions for Light and Text entities
 2014-12-08 09:19:06 -08:00
Philip Rosedale
732b40f68c Merge pull request #3918 from ZappoMan/acEntityCrash 
Ac entity crash
 2014-12-08 09:16:40 -08:00
ZappoMan
cf98bff28b enforce dimensions for Light and Text entities 2014-12-08 07:23:45 -08:00
ZappoMan
497fbade9b fix crash in entity related AC scripts 2014-12-08 06:48:04 -08:00
ZappoMan
398b5b1f91 Merge branch 'master' of https://github.com/highfidelity/hifi into fixEllipsoidRayPick 
Conflicts:
	libraries/entities/src/SphereEntityItem.cpp
	libraries/entities/src/SphereEntityItem.h
 2014-12-07 21:03:09 -08:00
ZappoMan
dd4f3a4006 coding standard, added comments 2014-12-07 20:18:30 -08:00
ZappoMan
b9891748e1 remove dead code 2014-12-07 01:32:31 -08:00
ZappoMan
b08d5b87ca implement proper ray picking against ellipsoids 
Conflicts:
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-07 01:31:40 -08:00
ZappoMan
08092e7abe removed dead code 2014-12-06 15:06:00 -08:00
ZappoMan
3bb16ce831 properly wire up precision picking in JS api 2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -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
ZappoMan
ae647d39d0 fix models with registrations other than 0,0,0 2014-12-05 16:14:18 -08:00
ZappoMan
0ccbb98bde more work on improved model picking 2014-12-05 15:03:35 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
ZappoMan
5ec9a9b6ed make text entities correctly ray pick 2014-12-04 13:49:46 -08:00
ZappoMan
842ee714b8 make text entities correctly ray pick 2014-12-04 13:08:16 -08:00
ZappoMan
11f10f9512 make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances 2014-12-04 10:54:04 -08:00
ZappoMan
958b37dead Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-04 09:38:38 -08:00
Andrew Meadows
ab011d5b30 fix for non-animating models 2014-12-03 16:49:49 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Andrew Meadows
85e7c6166b support for spherical entities 2014-12-03 12:10:26 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
Andrew Meadows
c9ea6885c1 PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -08:00
ZappoMan
5c2cc20313 fixes the stutter in animation when observer moves 2014-11-28 17:36:55 -08:00
Andrew Meadows
051b04402f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
 2014-11-26 17:21:11 -08:00
Andrew Meadows
0b56169c6e fix build after merge 2014-11-26 17:18:19 -08:00
Andrew Meadows
3781c23480 add entities to simulation after unpacking 2014-11-26 17:09:53 -08:00
Andrew Meadows
5acaaa9c3b merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-26 15:36:08 -08:00
Andrew Meadows
b543434a17 EntityTreeHeadlessViewer gets a simulation 2014-11-26 12:16:52 -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
Andrew Meadows
e574c5766b EntityItem::setSimulationState() now public 2014-11-24 22:28:27 -08:00
Andrew Meadows
1c636fe6b2 more correct entity list maintenance 2014-11-24 20:37:09 -08:00
Andrew Meadows
37093cbd00 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-11-24 11:24:39 -08:00
Andrew Meadows
ec1f11c1a8 route more entity updates into physics engine 2014-11-24 11:21:40 -08:00
Brad Hefta-Gaub
168487e0a7 Merge pull request #3840 from huffman/entity-snap-on-create 
Entity snap on create (+ remove getEntityItemID)
 2014-11-20 09:58:54 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Andrew Meadows
47f2cbd73b merge upstream/master into andrew/inertia 2014-11-19 17:07:55 -08:00
Clément Brisset
2c6a76ec17 Merge pull request #3830 from huffman/entity-list-window 
Entity list window
 2014-11-19 17:05:48 -08:00
Andrew Meadows
51da678675 update entity MotionType when it changes 2014-11-19 17:05:31 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
63be5ae9bf Merge pull request #3834 from ZappoMan/fixMissingRegistrationPointBug 
fix a major bug in updateEntity() caused by the new properties not containing "registrationPoint"
 2014-11-19 16:42:16 -08:00
ZappoMan
2a08a6d48e fix a bug in updateEntity() caused by the new properties not containing registrationPoint 2014-11-19 16:07:07 -08:00
Andrew Meadows
8bd3779d7d merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.h
 2014-11-19 15:55:10 -08:00
Andrew Meadows
11e7339e9e add UPDATE_COLLISION_GROUP and UPDATE_MOTION_TYPE 2014-11-19 15:52:57 -08:00
Andrew Meadows
961dc5a231 merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
 2014-11-19 15:41:53 -08:00
Ryan Huffman
a18a83d45c Update getEntityItemID() to check for id existence 2014-11-19 15:31:41 -08:00
Andrew Meadows
48164c9399 cleanup and moving things around 2014-11-19 15:31:17 -08:00
Andrew Meadows
97d1dc4200 use updateFoo() where entity properties need relay 
clear EntityItem updateFlags when processed
 2014-11-19 15:12:22 -08:00
Andrew Meadows
a183248f38 add updateFoo() methods that accumulate flags 
about properties that have changed
 2014-11-19 14:12:26 -08:00
Andrew Meadows
3b85805048 add EntityItem::updateFoo() methods that set flags 
when properties are actually changed
 2014-11-19 14:01:55 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
Andrew Meadows
388830c2a2 Merge branch 'bispinor' into inertia 
Conflicts:
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/BoxEntityItem.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-18 10:23:38 -08:00
Andrew Meadows
2d400e6ae0 rename PhysicsWorld to PhysicsEngine 2014-11-18 09:55:25 -08:00
Andrew Meadows
2761409270 fix build error on linux 2014-11-18 08:55:01 -08:00
Andrew Meadows
47615ba9c2 changeEntityState() --> updateEntityState() 2014-11-17 17:38:26 -08:00
Andrew Meadows
af606f01a9 combined SimulationStates Moving and Changing 
also funnel entity updates by UDP packet through a single list
 2014-11-17 17:35:44 -08:00
Andrew Meadows
ac87c90d62 Remove Changing state, now keep QSet of changes 2014-11-17 15:53:03 -08:00
Andrew Meadows
2cf93697cb removed some crufty comments 2014-11-17 15:51:29 -08:00
Andrew Meadows
dd0bdabfe1 setSimulationState() --> computeSimulationState() 2014-11-17 15:50:35 -08:00
ZappoMan
05fa3c89a7 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-15 20:38:07 -08:00
ZappoMan
28fc6d15f4 test 2014-11-14 22:53:29 -08:00
ZappoMan
f0cd258a13 test 2014-11-14 22:51:04 -08:00
ZappoMan
66f519d613 dry up EntityItemProperties with macros 2014-11-14 22:15:19 -08:00
ZappoMan
55ac9c8ef7 make sure properties include type for proper encoding 2014-11-14 21:16:50 -08:00
ZappoMan
62c64479c2 first cut at text entity 2014-11-14 15:58:12 -08:00
Andrew Meadows
2f9a35412f initial support for STATIC and KINEMATIC motion 2014-11-14 15:56:52 -08:00
ZappoMan
11058355a0 implement aboutToFinish for persist thread to allow final save before shutdown 2014-11-14 09:55:32 -08:00
Andrew Meadows
5eb606c44a merge upstream/master into andrew/inertia 2014-11-14 09:04:27 -08:00
Andrew Meadows
40b9416810 cleanup motionstate on EntityItem delete 2014-11-14 09:04:09 -08:00
Andrew Meadows
7fb7256a92 MotionState also ferries velocity 2014-11-14 09:02:22 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
ZappoMan
7b69642c67 fix bug in animation jitter on turn 2014-11-13 23:03:12 -08:00
Atlante45
f914f02a0b Move user data to end of enum 2014-11-13 17:44:22 -08:00
Atlante45
9fc7451581 Move macros to the end 2014-11-13 17:06:57 -08:00
Atlante45
40576b3c03 moved append to the end 2014-11-13 17:02:45 -08:00
Atlante45
f8be98260c String specific macros 2014-11-13 16:32:15 -08:00
Atlante45
f47620231e Entities have user data 2014-11-13 16:16:20 -08:00
Andrew Meadows
1bed4eeb5b merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
 2014-11-13 10:53:23 -08:00
ZappoMan
3e521e089b fix unix build 2014-11-13 09:48:15 -08:00
ZappoMan
8ec12ea954 add full animation settings support 2014-11-13 08:59:06 -08:00
ZappoMan
701059d797 removed some debug 2014-11-13 08:58:33 -08:00
ZappoMan
bc60c90308 only actually set the properties if they were in the buffer 2014-11-13 08:39:19 -08:00
ZappoMan
e4355cd139 calculated animationSettings property to include older properties 2014-11-13 07:34:54 -08:00
ZappoMan
c9e8c21d8d partial work on blending of animation settings 2014-11-12 19:23:48 -08:00
ZappoMan
8a2e3d5045 add animationSettings property to model entities 2014-11-12 17:41:55 -08:00
ZappoMan
ef17659ea2 cleanup 2014-11-12 16:57:42 -08:00
ZappoMan
dd22683672 fixing up animation loop issues 2014-11-12 16:53:16 -08:00
ZappoMan
245f019836 first cut at migrating entity animation frame calculations to use AnimationLoop 2014-11-12 16:10:35 -08:00
Brad Hefta-Gaub
1d80fd7e4f Merge pull request #3772 from PhilipRosedale/master 
Less aggressive audio muting default, entity getter returns by reference
 2014-11-11 20:32:46 -08:00
Andrew Meadows
66857b823f EntityTree has a PhysicsWorld 2014-11-11 17:34:00 -08:00
ZappoMan
8ec3f8ce99 implement support for calling preload when the script changes 2014-11-11 14:21:06 -08:00
Philip Rosedale
8c35d4e3dc remove debug line 2014-11-11 14:08:59 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
Andrew Meadows
7c53c7a495 fix build to work when cmake does not fiind Bullet 2014-11-11 12:24:29 -08:00
Andrew Meadows
fa48da6c98 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2014-11-11 11:14:12 -08:00
Andrew Meadows
1ffb22e2de stubbery for BoxEntityImtem::createMotionState() 2014-11-11 10:56:52 -08:00
Philip Rosedale
38a142eeb8 return value by reference 2014-11-10 15:23:13 -08:00
Atlante45
d0a535aee5 Switch members in EntityItemProperties to hack around corruption bug 2014-11-10 10:24:14 -08:00
Ryan Huffman
d4fa24e9b6 Fix entity item properties not marking all props changed 2014-11-07 13:56:23 -08:00
ZappoMan
53f5019ee7 rename textureNames to originalTextures 2014-11-07 10:05:36 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
ZappoMan
c48d79ad8b add gettable feature which lists texture names 2014-11-07 09:05:47 -08:00
Andrew Meadows
ed90bf00b9 add offset to physics simulation 
we anticipate floating point error problems at distances far from origin
and we don't want the simulation to span a big space anyway
so world-frame objects are simulated in a local frame
and positions are translated back and forth as necessary
 2014-11-07 08:51:57 -08:00
ZappoMan
542d671e54 cleanup entity scripts when changing domains or entity is deleted 2014-11-06 20:01:09 -08:00
Andrew Meadows
053b16783c initial impl of PhysicsWorld::addEntity() 2014-11-06 16:42:07 -08:00
ZappoMan
768a854b00 cleanup 2014-11-06 14:00:26 -08:00
ZappoMan
90b079d5a8 remove debug 2014-11-06 13:51:48 -08:00
ZappoMan
5333f0eb19 quiet some debug 2014-11-06 13:45:30 -08:00
ZappoMan
2b62402a57 possible fix for entities not always updating bug 2014-11-06 13:17:46 -08:00
Andrew Meadows
57f13f3a7c entities lib now depends on bullet (if exists) 2014-11-05 17:05:26 -08:00
Andrew Meadows
fb0eddcc32 merge upstream/master into andrew/inertia 2014-11-05 16:35:59 -08:00
Andrew Meadows
bcac1b9b31 minor comment typos 2014-11-05 16:35:24 -08:00
ZappoMan
13e358549d add periodic pruning of the octree on load and save 2014-11-05 14:56:38 -08:00
ZappoMan
e12e3b05e1 add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity 2014-11-03 15:33:01 -08:00
ZappoMan
e7722dc692 pass args to object scripts for mouse events 2014-10-31 15:20:16 -07:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
ZappoMan
277da5a24f first cut at wiring up new entity specific UI/UX events 2014-10-31 10:23:45 -07:00
ZappoMan
6d613fba3c removed debug 2014-10-30 11:26:48 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
ZappoMan
c650cabb5d support for locked property, some plumbing for textures property 2014-10-30 10:05:20 -07:00
ZappoMan
ac115086cc move float bool bugs 2014-10-30 00:26:06 -07:00
ZappoMan
1d9c4a6454 fix bug in light properties 2014-10-29 23:18:20 -07:00
ZappoMan
1dd4c4c674 move sitting points back to a contained element to fix the crash Ryan was seeing 2014-10-29 10:13:48 -07:00
AndrewMeadows
825482499a Merge pull request #3682 from ZappoMan/moreLightPropertiesAttempt2 
fix memory leak
 2014-10-28 15:33:14 -07:00
ZappoMan
47ba32e95e feedback 2014-10-28 15:27:56 -07:00
Brad Hefta-Gaub
c39c716755 Merge pull request #3679 from AndrewMeadows/inertia 
move code out of "shared" and into new "physics" lib
 2014-10-28 15:25:38 -07:00
ZappoMan
4ec70041cc fix memory leak 2014-10-28 15:20:02 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
ZappoMan
f26bf5e07b duh 2014-10-28 13:19:47 -07:00
ZappoMan
6c63c2ecd9 cleanup 2014-10-28 12:47:46 -07:00
ZappoMan
f3242d8778 make PROP_DIFFUSE_COLOR a true property and wire up LightEntityProperties correctly 2014-10-28 10:46:50 -07:00
ZappoMan
a516d062a6 fix corruption in sitting points, added additional light properties 2014-10-28 09:55:13 -07:00
ZappoMan
1de618ed3e added new light related properties 2014-10-27 16:25:26 -07:00
ZappoMan
bb1eacce7d more tweaks for new light properties 2014-10-27 15:37:52 -07:00
ZappoMan
ac9c5e7386 some initial adds to properties 2014-10-27 15:32:36 -07:00
ZappoMan
c17ffe9433 add the new properties to LightEntityItem class 2014-10-27 15:31:21 -07:00
ZappoMan
5e497c2d97 added new macro for getter access to a color 2014-10-23 09:18:11 -04:00
ZappoMan
bf199c1f30 add PROP_IS_SPOTLIGHT to the requested properties 2014-10-22 10:11:01 -07:00
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
82a9429414 add boundingBox.dimensions to entity properties 2014-10-10 17:10:27 -07:00
ZappoMan
db881c0dc8 add boundBox gettable property to EntityItemProperties 2014-10-10 10:32:18 -07:00
ZappoMan
48071bbdb3 don't collide with entities with unknown IDs 2014-10-08 11:48:30 -07:00
ZappoMan
729e40881d removed some old debug 2014-10-02 17:55:55 -07:00
ZappoMan
e65f383b25 add localRenderAlpha property to entities 2014-10-01 09:43:03 -07:00
ZappoMan
7bea4b3123 also honor ignore collisions for voxels and avatars 2014-09-26 15:12:59 -07:00
ZappoMan
bbd476d564 handled multiple collisions correctly, and don't collide if fully enclosed 2014-09-26 14:55:05 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
ZappoMan
2f0a9b517f make sphere entities use sphere shape for better collisions 2014-09-25 14:49:52 -07:00
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
ZappoMan
eda168a6d9 first cut at shape collisions 2014-09-24 19:51:37 -07:00
ZappoMan
9cc1fe35db only do collisions on entities moving toward each other 2014-09-24 18:22:28 -07:00
ZappoMan
2cfa14d5ad changed to only collide with moving entities 2014-09-24 18:06:08 -07:00
ZappoMan
4b52fddffd collions with voxels and avatars 2014-09-24 17:37:56 -07:00
ZappoMan
8d9a923add fix the collision last edited behavior correctly, delete collision sound code 2014-09-24 16:04:39 -07:00
ZappoMan
10865944f0 removed some debug 2014-09-24 15:44:09 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
ZappoMan
ffe1e2db00 fix crash in butterflies.js 2014-09-16 09:07:22 -07:00
ZappoMan
64479b067e fix more warnings, replace assert with debug message 2014-09-13 08:21:23 -07:00
ZappoMan
51b66bdee3 fixed warnings and converted several asserts to debug messages 2014-09-13 08:14:31 -07:00
ZappoMan
45fc8423ba move getRadius to public for now 2014-09-12 10:26:47 -07:00
ZappoMan
64e2033b30 move getRadius to public for now 2014-09-12 10:26:24 -07:00
ZappoMan
e8c1cb7db8 read old format files correctly 2014-09-12 09:38:35 -07:00
ZappoMan
25d051090a swap order of local vs server changes in entity scripting to improve potential conflicts 2014-09-12 08:48:40 -07:00
ZappoMan
baaf01683e removed some verbose comments 2014-09-12 08:23:13 -07:00
ZappoMan
4bce7f8c0b removed debug 2014-09-12 08:14:28 -07:00
ZappoMan
54ef5d4698 fixed bugs in MovingEntitiesOperator, improved getDistanceToBottomOfEntity, isRestingOnSurface 2014-09-12 07:45:33 -07:00
ZappoMan
77dff69805 fix ray picking to work with registation points 2014-09-11 17:03:01 -07:00
ZappoMan
695569b64b reconcile use of getAACube() and handle rotations properly 2014-09-11 16:43:53 -07:00
ZappoMan
9f4d199440 move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes 2014-09-11 15:36:13 -07:00
ZappoMan
2757f16045 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:29:47 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
ZappoMan
a3e3a1dc2b cleanup dead code 2014-09-10 20:07:45 -07:00
ZappoMan
a3e47aa301 fix angular velocity damping so we don't get bad quats 2014-09-10 17:46:50 -07:00
ZappoMan
cbdaf76b88 dry up the EntityItemProperties::copyFromScriptValue() with macros for repeated blocks 2014-09-10 15:39:00 -07:00
ZappoMan
8339dfaeb3 fix EntityItemProperties::markAllChanged() 2014-09-10 15:05:27 -07:00
ZappoMan
8023735eb3 changed rotational to angular and added angular damping 2014-09-10 14:46:27 -07:00
ZappoMan
f33690cc38 fix velocity and gravity to be in meters 2014-09-10 11:55:23 -07:00
ZappoMan
bb52c4a1b3 store angular valocity as 3 vector 2014-09-10 11:28:45 -07:00
ZappoMan
7283e7818f moved macros to sep file 2014-09-10 09:19:24 -07:00
ZappoMan
53da483381 more work on visible, registration point, and rotational velocity 2014-09-10 09:05:46 -07:00
ZappoMan
fac7d20c8a basic support for PROP_REGISTRATION_POINT, PROP_ROTATIONAL_VELOCITY, and PROP_VISIBLE 2014-09-09 20:38:58 -07:00
ZappoMan
fd59f58989 added script property to EntityProperties setting/getting and scripting 2014-09-09 20:18:01 -07:00
ZappoMan
44230a315b add naturalDimensions and moved sitting points to exclusively be in properties 2014-09-09 17:45:50 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
ZappoMan
420f7de957 fix various crashes in entites 2014-09-07 20:31:54 -07:00
ZappoMan
9fdd1f422a fix crash on change domains while entities are animating or moving 2014-09-06 16:54:36 -07:00
Andrew Meadows
e7b39ae119 removed unused variable 2014-09-05 16:42:24 -07:00
Andrew Meadows
3ae78da593 fixed signed/unsigned comparison 2014-09-05 16:41:51 -07:00
ZappoMan
e1064d8da7 correctly implement data types who assume all child data must be included (e.g. voxels) 2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350 more work on fixing voxels 2014-09-05 11:51:17 -07:00
ZappoMan
60e8056cd8 removed some debug code 2014-09-05 02:20:30 -07:00
ZappoMan
dc31381fc1 better handling of old model files 2014-09-05 02:19:17 -07:00
ZappoMan
a189f077b8 fix huge-mega-voxels and voxel file corruption 2014-09-05 01:13:22 -07:00
ZappoMan
931e5fa408 fix potential static memory corruption 2014-09-04 15:43:51 -07:00
ZappoMan
957991b67e patch for possible static memory corruption on large edit entity messages 2014-09-04 09:52:26 -07:00
ZappoMan
3e1401014d more model naming cleanup and fixing example scripts 2014-09-03 18:32:44 -07:00
ZappoMan
e680260c89 remove assert in favor of warning 2014-09-03 17:17:36 -07:00
ZappoMan
d89b29581b remove assert in favor of warning 2014-09-03 17:14:34 -07:00
ZappoMan
d08e7ef96d fix bug in way too small entities 2014-09-03 15:20:42 -07:00
ZappoMan
76511762dc fix bug in getContainingElement() found by andrew, allow sciprting interface to return properties of local only entities 2014-09-03 13:14:06 -07:00
ZappoMan
29bbeadbc7 fix method names for CR feedback 2014-09-03 12:44:57 -07:00
ZappoMan
59d0bb29a2 useless semicolon removal 2014-09-03 12:28:35 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
ZappoMan
446daa81a5 fix issue of server clock skew changing without breaking animation and moving 2014-09-02 20:01:41 -07:00
ZappoMan
e8b1497d60 revert to old _lastUpdated behavior to fix animations and movement 2014-09-02 19:28:33 -07:00
ZappoMan
9cf6fcdaab warning fix 2014-09-02 18:45:38 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -07:00
ZappoMan
10d581925c DRY up the property reading code by using macro for repeated pattern 2014-09-02 10:31:26 -07:00
ZappoMan
799931aa6c DRY up the property setting code by using macro for repeated pattern 2014-09-02 09:30:28 -07:00
ZappoMan
033017346c removed debug code 2014-09-02 08:53:19 -07:00
ZappoMan
2b5d631290 removed a ton of old dead debug code 2014-09-02 08:44:43 -07:00
ZappoMan
fa5c2b9638 removed todo file 2014-09-01 23:09:18 -07:00
ZappoMan
f16a48e187 quiet some debugging 2014-09-01 22:38:18 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
ZappoMan
1fa587b88a suppress unchanged entities 2014-08-29 21:51:08 -07:00
ZappoMan
d1a046e6ed properly handle LOD in rendering by not rendering small entities 2014-08-29 21:18:31 -07:00
ZappoMan
ed670ff48e fix bug with animations randomly not working 2014-08-29 20:19:24 -07:00
ZappoMan
2fab662e8c fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit 2014-08-29 17:48:14 -07:00
ZappoMan
f654fac851 fixed a couple crashes in editing entities 2014-08-29 10:56:07 -07:00
ZappoMan
06a9116082 updated TODO 2014-08-28 22:15:22 -07:00