Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 16:47:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 25 branches 0 tags 1.1 GiB
Commit graph

2984 commits

Author SHA1 Message Date
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
ZappoMan
97706e3aed updated TO DO 2014-08-28 22:05:01 -07:00
ZappoMan
93511616d6 prevent editing of entities out of doamin 2014-08-28 21:54:25 -07:00
ZappoMan
ad9ce2edd3 delete moving entities that travel outside of domain 2014-08-28 21:34:12 -07:00
ZappoMan
de968ba4f6 fix the issue with moving entities not being simulated makes motion smoother 2014-08-28 16:44:52 -07:00
ZappoMan
c83cb6386a updated to do list 2014-08-28 14:32:13 -07:00
ZappoMan
eab9f391ee fix getProperties() for age 2014-08-28 14:02:05 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
ZappoMan
ed6363ca02 fixed bug in processing of entity erase messages 2014-08-27 14:21:06 -07:00
ZappoMan
5c2b674a0d verify delete behavior actually frees memory associated with EntityItems 2014-08-27 12:07:11 -07:00
ZappoMan
30e00bbd69 final pass on entities import/export/overlays working as well as production 2014-08-27 11:34:50 -07:00
ZappoMan
fb25314248 mark one more item off to do 2014-08-26 17:13:38 -07:00
ZappoMan
b14158385c first cut at getting pastEntities() working 2014-08-26 16:47:32 -07:00
ZappoMan
4895ee32f7 test and fix issues with exportEntities() 2014-08-26 15:59:49 -07:00
ZappoMan
53db93c7d7 updated to do list 2014-08-26 13:25:19 -07:00
ZappoMan
8d947662c8 fix conversion from old format to new format of entity IDs 2014-08-26 13:21:49 -07:00
ZappoMan
edf7866c08 to do edits 2014-08-26 12:25:08 -07:00
ZappoMan
3e5af5e815 removed some debug 2014-08-26 10:45:40 -07:00
ZappoMan
ef8feec91a fix referentials corruption and removed some debugging 2014-08-26 10:42:46 -07:00
ZappoMan
d6873f7b6c added some debugging for referentials 2014-08-25 14:48:08 -07:00
ZappoMan
1764839223 get basics of referentials working 2014-08-25 14:07:01 -07:00
ZappoMan
314e299ba5 get sit points working 2014-08-25 13:03:38 -07:00
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
ZappoMan
b7b89dcbec move glow effect to property of all entities, add tools for editing boxes 2014-08-06 12:29:09 -07:00
ZappoMan
ebe7182ab6 get models actually rendering again 2014-08-06 10:25:44 -07:00
ZappoMan
e540bef672 more hacking on rendering of virtual entities 2014-08-06 09:12:14 -07:00
ZappoMan
a194db837f first cut at registered EntityType renderers 2014-08-05 16:06:21 -07:00
ZappoMan
50309ef371 added other types, just stubs for now 2014-08-05 14:20:24 -07:00
ZappoMan
e9db4fd120 registration of multiple entity types: Model and Box 2014-08-05 12:10:17 -07:00
ZappoMan
273853ef24 more work on virtual entities 2014-08-04 16:18:24 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
ZappoMan
23aa5a124e fix up lastEdited behavior 2014-07-31 11:41:18 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
ZappoMan
dd3d4be73b added notes on experimental new replacement for addOrUpdateEntity() 2014-07-30 07:19:59 -07:00
ZappoMan
76ae4c9721 quiet logs 2014-07-29 16:54:21 -07:00
ZappoMan
4655612cdb handle moving of existing entities in case of inbound data from server causing entities to move to new elements 2014-07-29 15:50:17 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -07:00
ZappoMan
230c2f2684 cleanup storage of entity ids on the server, added improved checks for server vs client 2014-07-29 12:52:46 -07:00
ZappoMan
30aee70346 latest work 2014-07-21 09:18:21 -07:00
ZappoMan
9409d07c46 make sure entities constructed from reading buffers are included in the entity hash map 2014-07-17 11:22:25 -07:00
ZappoMan
6b62c6b976 get virtual entities constructing from buffers 2014-07-17 11:16:03 -07:00
ZappoMan
0c7afc39ca refactoring EntityItemID management and id assignment to be part of EntityItemID class instead of EntityItem class 2014-07-17 10:24:32 -07:00
ZappoMan
1125cb183e splitting up a bunch of Entity classes into different files 2014-07-16 09:25:54 -07:00
ZappoMan
d4a8711ff6 more hacking on edit packets 2014-07-15 11:42:46 -07:00
ZappoMan
61d998d2ad tweaks 2014-07-15 10:29:29 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
ZappoMan
780532bfd8 more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe 2014-07-10 13:42:49 -07:00
ZappoMan
3c4f5f88d0 checkpoint on virtual entities 2014-07-09 18:24:31 -07:00
ZappoMan
a4b7673a2c some more virtual entity work 2014-07-07 14:29:03 -07:00
ZappoMan
3145d150f3 more work on virtual entities, unit tests passing woot 2014-07-07 12:56:32 -07:00
ZappoMan
29e02f2681 more hacking on virtualizing entities 2014-07-07 09:36:31 -07:00
ZappoMan
c449ba27a9 more virtual entity work 2014-07-03 15:18:17 -07:00
ZappoMan
5e5af9ceea hacking on more support for virtual entities 2014-07-03 10:44:34 -07:00
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -07:00
ZappoMan
84101fce2c naming cleanup and organizational tweaks 2014-07-02 11:22:56 -07:00
ZappoMan
fe30d3807c more renaming to entity from model where we're really talking about an entity 2014-07-01 17:07:16 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
ZappoMan
b113c2d55c fix readEntityIDFromBuffer 2014-06-27 11:56:59 -07:00
ZappoMan
d618b4226b entity type work, and byte coding for id and type 2014-06-27 10:53:55 -07:00
ZappoMan
ad7a768fff more renaming work 2014-06-27 09:14:17 -07:00
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00