Commit graph

88 commits

Author SHA1 Message Date
ZappoMan
1663ff86d7 removed dead code 2014-08-25 12:45:09 -07:00
ZappoMan
700b945d71 disabled some debugging 2014-08-25 11:35:28 -07:00
ZappoMan
d0ceca1935 moved EntityTree operator related classes to own files to match coding standard 2014-08-25 11:29:11 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
ZappoMan
75bb42fb73 debug cleanup 2014-08-22 10:54:00 -07:00
ZappoMan
17426a1c71 removed tons of debugging 2014-08-20 17:47:16 -07:00
ZappoMan
ef86d86234 split out entity rendering into subclasses, improved rendering of models 2014-08-20 15:49:50 -07:00
ZappoMan
ddae85ce4a updated todo 2014-08-19 14:24:39 -07:00
ZappoMan
3a5a38c342 support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file 2014-08-19 10:53:45 -07:00
ZappoMan
960e9eb2f4 debugging tweaks 2014-08-19 09:43:09 -07:00
ZappoMan
7d675b78fe more todo 2014-08-19 09:41:46 -07:00
ZappoMan
daffb00bf2 build issues fixed after merge 2014-08-18 15:41:20 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
ZappoMan
49cf6dff3a more DIDNT_FIT logic improvements/fixes 2014-08-18 14:09:01 -07:00
ZappoMan
f8f0da189f more work on more entities in a cell 2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4 work on reseved bytes in octree packet data 2014-08-15 11:26:55 -07:00
ZappoMan
abe892ddc3 quiet some debugging 2014-08-14 11:36:53 -07:00
ZappoMan
fbe409a0c2 added lots of debugging for octree edit packet sender bug fixed threading issue 2014-08-14 11:23:56 -07:00
ZappoMan
b7e258519b fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet 2014-08-13 17:12:03 -07:00
ZappoMan
49e616dd49 first cut at using erase entity message to delete entities 2014-08-13 14:11:56 -07:00
ZappoMan
4bdb8765f5 implement improved pruning on updates/moves/delete passes of the tree added some debug support 2014-08-13 10:29:25 -07:00
ZappoMan
6ce6d8ae47 dont try to create child elements that are smaller than the entities 2014-08-12 14:29:55 -07:00
ZappoMan
8339f1059e clean up more debugging noise 2014-08-12 13:29:14 -07:00
ZappoMan
3551bd676f quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds 2014-08-12 13:14:28 -07:00
ZappoMan
76308738e0 added pruning support, some cleanup 2014-08-12 07:16:32 -07:00
ZappoMan
466b4c5e40 add some basic support for coming to a rest on the ground plane in case of downward gravity 2014-08-11 14:52:19 -07:00
ZappoMan
779d846f1e add gravity to the editModels property 2014-08-11 13:27:19 -07:00
ZappoMan
b89c740e17 improved velocity behavior, handling lastUpdated better, changing state when velocity reaches zero 2014-08-11 11:56:05 -07:00
ZappoMan
7c8163c475 first cut at getting velocity to work in entity base class 2014-08-11 10:36:03 -07:00
ZappoMan
a96aa5f937 clean up subclass properties, properly handle new baseclass props like damping 2014-08-10 14:20:37 -07:00
ZappoMan
55e12baf78 more base class properties work 2014-08-08 18:06:16 -07:00
ZappoMan
eda5614a75 implement readEntitySubclassDataFromBuffer() for BoxEntityItem 2014-08-08 17:59:32 -07:00
ZappoMan
2892c37210 implement readEntitySubclassDataFromBuffer() for EntityItem 2014-08-08 17:55:56 -07:00
ZappoMan
90c7989765 implement appendSubclassData() for EntityItem 2014-08-08 17:38:26 -07:00
ZappoMan
ebc3013904 more work on more properties 2014-08-08 16:42:31 -07:00
ZappoMan
b509eed59a more property work 2014-08-08 16:20:03 -07:00
ZappoMan
914b20a862 more entity item base class properties 2014-08-08 15:57:43 -07:00
ZappoMan
f899dc1f79 moving entity edit packet encode/decode to the EntityItemProperties class 2014-08-08 15:41:55 -07:00
ZappoMan
b7767b7971 get referentials compiling with new Entity ID changes 2014-08-08 15:12:57 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
ZappoMan
d50a607bc7 started support for new entity base class properties like velocity, gravity, damping, and lifetime 2014-08-08 11:38:03 -07:00
ZappoMan
a8188b39d7 improve performance of handleAddEntityResponse() to use map and not recurse tree 2014-08-08 09:44:12 -07:00
ZappoMan
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
ZappoMan
2a65de8026 todo 2014-08-07 14:48:17 -07:00
ZappoMan
37a6064cec todo 2014-08-07 14:39:17 -07:00
ZappoMan
cd4ea4b34f more animation work 2014-08-07 13:13:37 -07:00
ZappoMan
f1d2017a9e getting animation working again 2014-08-07 12:50:02 -07:00
ZappoMan
d1589e0d8e removed addOrUpdateEntity() replaced with more efficient approach 2014-08-07 10:10:44 -07:00
ZappoMan
99d44ce945 make factories an array instead of map 2014-08-07 09:24:43 -07:00
ZappoMan
720f60b99e fixed bad ids from constructing entities from buffers 2014-08-06 12:52:40 -07:00