Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Seth Alves
b1c5a04531
respond to code review
2015-09-11 09:29:52 -07:00
Brad Davis
b7ffb96adf
Working on thread safety for the entity tree
2015-09-10 22:28:50 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
ZappoMan
4fe8f49d4c
move origin to center of domain
2015-08-11 23:47:40 -07:00
Andrew Meadows
f09b3eb736
set creation time when loading unknown timestamp
2015-07-17 12:14:07 -07:00
ZappoMan
0c0b8dbbc1
add stats for elements and entities per incoming packet
2015-07-02 16:19:13 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
Seth Alves
5f3b902798
remove debugging print
2015-06-15 11:24:29 -07:00
Seth Alves
c1668553fd
make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening
2015-06-15 11:22:07 -07:00
ZappoMan
76c5bd1ab7
verify that entityitem cleanup is happening correctly
2015-05-22 22:01:25 -07:00
ZappoMan
9fa9942861
more work on smart pointers
2015-05-22 21:45:57 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -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
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
Seth Alves
6107682658
handle ignoring simulation data echoed back to us differently
2015-04-20 16:36:56 -07:00
Seth Alves
d6c8bd94cf
clean up some debugging prints
2015-04-20 15:59:33 -07:00
Seth Alves
56b005a872
packets should be ignore if they contain local nodeID, not if local entity contains nodeID
2015-04-20 12:19:36 -07:00
Seth Alves
f77038c52d
when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up
2015-04-17 09:37:48 -07:00
Seth Alves
d7059d8f2d
add code for uuids in wire protocol. some debugging prints
2015-04-16 14:46:38 -07:00
Seth Alves
6c4d232ad9
respond to code review
2015-04-15 16:08:15 -07:00
Seth Alves
e3a90b80a4
fix typo in comment
2015-04-15 16:04:18 -07:00
Seth Alves
62b59b7ccc
remove uneeded debug print
2015-04-15 11:02:12 -07:00
Seth Alves
3cf31ff701
fix to allow modelEntityItems with shape of box into physicsengine. ignore entity updates echoed back to us. stop broadcasting after 3 non-moving updates
2015-04-14 13:32:02 -07:00
Seth Alves
d4461f1ecb
put avatars and embedded-webserver and entities logging into their own QLoggingCategory
2015-04-06 16:22:54 -07:00
Andrew Meadows
95c7bcb5f8
whoops -- remove last *InTreeUnits() calls
2015-03-06 15:34:35 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Andrew Meadows
e4c68bf31c
committing some temp debug stuff to help git diff
...
(will remove this stuff later)
2015-03-05 18:06:08 -08:00
Andrew Meadows
90b69b1ee0
replace some "InDomainUnits" calls with "InMeters"
2015-03-01 15:58:10 -08:00
Andrew Meadows
7836bb4dcd
rayIntersection uses meters instead of tree units
2015-02-26 17:42:17 -08:00
Andrew Meadows
2ffb19a0ed
getPosition() --> getPositionInDomainUnits()
...
and friends
2015-02-25 14:35:04 -08:00
Andrew Meadows
0b78156956
remove unnecessary #includes
2015-02-02 16:45:51 -08:00
Andrew Meadows
156c4fcc9f
removing legacy collision detection code in Octree
2015-02-02 16:42:05 -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
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
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
ZappoMan
72cced12a6
guards for NULL collisions, possible fix to fountain crash
2014-12-23 11:30:32 -08:00
Andrew Meadows
9e9929da91
merge upstream/master into andrew/thermonuclear
2014-12-08 11:22:39 -08:00
ZappoMan
08092e7abe
removed dead code
2014-12-06 15:06:00 -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
