Andrew Meadows
699e632e68
remove EntityItem::SimulationState after bad merge
2014-12-09 12:45:21 -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
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
