Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 16:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64648 commits 25 branches 0 tags 1.1 GiB
Commit graph

502 commits

Author SHA1 Message Date
Seth Alves
a948ae5f19 children of avatar joints might be right, now 2015-12-06 10:48:00 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Seth Alves
4ab2bfa854 clean up, minimize diff 2015-11-26 08:35:28 -08:00
Seth Alves
c96a09976e Merge branch 'master' of github.com:highfidelity/hifi into update-model-during-simulate 2015-11-26 08:32:17 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Stephen Birarda
5a7b0dd1ad put the parsed model URL in ModelEntityItem 2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448 cleanup printing of updated model URL 2015-11-24 11:22:30 -06:00
Stephen Birarda
0e19e50047 cleaner handling for QString/QUrl conversion/comparison 2015-11-24 11:17:46 -06:00
Seth Alves
09f14bc9a5 guard against nullptr deferenece 2015-11-23 16:51:17 -08:00
Seth Alves
5cd047da15 move some more code over 2015-11-23 16:49:36 -08:00
Seth Alves
cfcff42004 missed a line 2015-11-23 16:41:16 -08:00
Seth Alves
283ad7ffd9 try, try again 2015-11-23 16:39:19 -08:00
Seth Alves
89e5b11f9e do this from update rather than simulate 2015-11-23 16:17:22 -08:00
Seth Alves
7b70562a1b update RenderableModelEntityItem::_model during simulate rather than during render 2015-11-23 15:51:43 -08:00
Stephen Birarda
6339c2c48f fix for unnecessary model URL updating 2015-11-23 17:25:31 -06:00
Seth Alves
ba30e01664 include global position in avatar-mixer protocol so server knows where avatars are in world-space 2015-11-23 14:12:49 -08:00
Seth Alves
a08bad8cbd for models, relay getJointRotation and getJointTranslation to the model 2015-11-23 13:46:32 -08:00
Seth Alves
4646c0c103 unmangle merge 2015-11-21 10:49:31 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Seth Alves
f07d5d9d3f show network and physics status on boxes and spheres 2015-11-11 11:32:12 -08:00
Seth Alves
4cf84a4e5b use makeEntityItemStatusGetters from more entity types 2015-11-10 17:14:09 -08:00
Seth Alves
7b4dd9a908 Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug 2015-11-10 17:06:16 -08:00
Seth Alves
39b92d2b52 terse log when ownership changes 2015-11-10 17:06:12 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Seth Alves
d535109caf attempt to fix render-collision hull feature 2015-11-10 09:49:31 -08:00
Seth Alves
bc516c0b86 use render-item status getters to display physics debugging information 2015-11-06 11:32:56 -08:00
Seth Alves
61269c3ce8 fix up entity constructors so that setProperties isn't called during the constructor 2015-10-23 13:52:50 -07:00
Seth Alves
113321184d if model RegistrationPoint doesn't match entityItem's, update it 2015-10-19 12:21:26 -07:00
Seth Alves
742e48b0c8 try another way of fixing held object snagging at slow velocity 2015-10-19 09:48:34 -07:00
Seth Alves
1f3b92577d update _model's location anytime it doesn't match the entity's location 2015-10-17 20:08:25 -07:00
Atlante45
a84fdecec9 Fix export bug 2015-10-15 18:43:32 -07:00
Atlante45
ae83dfe041 Move auto-resize to update 2015-10-09 12:23:19 -07:00
Atlante45
75f0a6442f ModelEntities spawned with no dimension autoresize 2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
57cc7adbfe standardize somethingChanged - CR feedback 2015-10-07 12:27:12 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
f30a94064f make animation start/stop work 2015-10-05 15:50:55 -07:00
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Brad Hefta-Gaub
4e2cb00ec3 first cut at only returning type specific properties in getEntityProperties 2015-09-17 17:33:53 -07:00
Brad Hefta-Gaub
e1cb041576 first cut at adding desiredProperties to getProperties 2015-09-16 15:00:42 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
8ee27bca2b remove urlAsString from Model 2015-08-27 16:00:21 -07:00
ZappoMan
942958c4f1 only setJointState() if animation frame actually changed 2015-08-09 16:07:56 -07:00
ZappoMan
cec0f8ed1d optimize ModelEntityItem::getAnimationFrame() 2015-08-07 13:43:57 -07:00
ZappoMan
f4c3c30f6a quick optimization to RenderableModelEntityItem::render() 2015-08-07 12:49:48 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Atlante45
8fb69ecc96 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6 Merge pull request #5306 from ctrlaltdavid/20606 
CR for 20606 - If an external texture isn't found, still display the model
 2015-07-14 13:49:00 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
David Rowe
8ecefdfe39 If an external texture isn't found, still display the model 
If the texture is present the next Interface is run then it will be used.
 2015-07-10 16:03:27 -07:00
Atlante45
a3848f08d2 Conditionnal fixes. 2015-07-10 15:36:17 -07:00
Atlante45
49993695a5 Made geometry refresh safe 2015-07-10 15:20:19 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
Sam Gateau
4d48b98364 For a fistfull of magic numbers 2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45 CLenaing the interface of Item::Status to be more explicit and removing magic numbers 2015-07-06 12:47:35 -07:00
Sam Gateau
76ca093e05 something working ? 2015-07-02 18:12:03 -07:00
samcake
0c55130548 maybe i have solved the passing of the status 2015-07-02 17:31:29 -07:00
Sam Gateau
79be37f78f improvment ? 2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb improvment ? 2015-07-02 15:53:02 -07:00
Sam Gateau
be8fe25338 Trying to finalize the look and behavior of th estatus indicators 2015-07-02 15:06:07 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Sam Gateau
dfa6b03a6b Making the first statusGetter noitify 2015-07-01 14:20:35 -07:00
Sam Gateau
2f04a9d3da refining the shader pipeline and trying to pass a Status Getter from the model and fails 2015-07-01 07:47:46 -07:00
Andrew Meadows
4df87ec4e8 fix rendering of simulation ownership debug info 2015-06-09 17:23:37 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Brad Hefta-Gaub
4bbde3d724 Merge pull request #5058 from huffman/entity-update-url 
TEAM TEACHING - Fix model entities correctly updating payloads when url changes
 2015-06-05 09:27:36 -07:00
Ryan Huffman
9814d11bea Fix model entities correctly updating payloads when url changes 2015-06-05 08:45:31 -07:00
Clément Brisset
5f16b8752b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 
Conflicts:
	libraries/entities-renderer/src/RenderableEntityItem.cpp
	libraries/render-utils/src/Model.cpp
 2015-06-05 13:28:42 +01:00
Ryan Huffman
a62b55fcb2 Update entity payload items to correctly hide when not visible 2015-06-04 13:25:40 -07:00
Atlante45
8e21d9c14b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:11:17 +02:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
Atlante45
9df1b05184 Introduce outsideEngineDetails 2015-06-03 18:08:43 +02:00
Atlante45
bbf1837796 Introduced RenderDetails/Stats don't pull details 
- Regrouped everything stat in a struct
	- Details are set into the stats
 2015-06-03 16:14:23 +02:00
ZappoMan
037246ee3c implement meta item for model entities 2015-06-01 15:58:43 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
ZappoMan
4b46fc3ad9 cleanup Model::renderPart() 2015-06-01 11:11:27 -07:00
ZappoMan
0124f98340 more hacking on rendering model parts 2015-05-29 21:56:24 -07:00
ZappoMan
dc62052a3c more hacking on models 2015-05-29 11:07:25 -07:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -07:00
Andrew Meadows
ac0609ea92 also render bbox when debugging simulator owner 2015-05-28 16:29:43 -07:00
ZappoMan
72ffd01920 more work on smart pointers 2015-05-22 22:39:37 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -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
Atlante45
e5d0851337 Remove unnecessary glPush/Pop 2015-05-20 16:29:43 +02:00
Atlante45
d0cd18d6c0 Replace entities pos/rot/dim with transform 
Removed _position, _rotation, _dimensions
Added Transform _transform
 2015-05-15 17:35:24 +02:00
Seth Alves
fe14202f51 add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated 2015-05-07 09:53:39 -07:00
Seth Alves
5ac8558168 flash yellow box when transmitting an edit packet 2015-05-06 17:03:27 -07:00
Seth Alves
ea1ec0186e stop doing useless multiple inheritance 2015-05-01 11:31:58 -07:00
Seth Alves
3765ace7ef move common debugging rendering into a new class 2015-05-01 11:17:46 -07:00
Seth Alves
3c24d42d93 improve display of box and model entities when in simulator-id debug mode 2015-04-30 14:17:20 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Seth Alves
ac46f84291 cleanups 2015-04-24 18:36:41 -07:00
Seth Alves
6e6793cbcc remove debugging prints 2015-04-24 15:18:02 -07:00
Seth Alves
1b84be6e10 attempting to have visual indicator of simulatorID 2015-04-24 10:55:43 -07:00
Atlante45
b776ea8110 Make ::contains() back into a const 2015-04-23 19:15:06 +02:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Atlante45
f494f86ee5 Handle registration point in transforms 2015-04-23 17:48:29 +02:00
Atlante45
6be0910966 Fix contain for collision hulls 2015-04-23 15:58:18 +02:00
Atlante45
99b3ef0d75 Move contain function to FBXGeometry 2015-04-22 21:17:12 +02:00
Atlante45
9cec256142 Rename collisionModelURL members/methods 2015-04-22 21:16:09 +02:00
Atlante45
f3fcb749df Fix algorithm + add comments 2015-04-22 21:03:55 +02:00
Atlante45
955723acf1 RenderableEntityItem uses collision hull in contains 2015-04-22 21:03:55 +02:00
Andrew Meadows
21d669f2f1 use computed shape type 2015-04-16 12:13:41 -07:00
Andrew Meadows
8623a0606c remove accidentally commited debug code 2015-04-14 15:39:24 -07:00
Andrew Meadows
5b81b5b11b removing SHAPE_TYPE_CONVEX_HULL from entities lib 2015-04-14 14:56:32 -07:00
Seth Alves
8479f0d4c1 don't compute shape info until both render and collision geometries are fully loaded 2015-04-13 09:34:38 -07:00
Seth Alves
e8ff727c61 when populating shape-info, give the dimensions of the collision model rather than those of the visual model 2015-04-07 15:47:13 -07:00
Seth Alves
074e476797 put entities-renderer logging into its own QLoggingCategory 2015-04-06 16:30:20 -07:00
Seth Alves
997f7251c7 dont need _collisionGeometryScale 2015-04-01 18:23:43 -07:00
Seth Alves
81200bb2a0 save collision hull scaling in model 2015-04-01 17:49:01 -07:00
Seth Alves
af6ce8fb07 HERE COMES AN S 2015-03-31 14:37:41 -07:00
Seth Alves
95cc8672c0 remove unneeded assert 2015-03-31 14:32:43 -07:00
Seth Alves
347ef3c4e1 use scaling from visual model on collision model rather than using the bounds from the collision model 2015-03-31 14:03:37 -07:00
Seth Alves
c8e623ace7 remove some debugging prints, added some comments 2015-03-31 07:18:20 -07:00
Seth Alves
acf30782b6 include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script 2015-03-30 17:04:47 -07:00
Seth Alves
ee7247a5b4 fix a couple of crashes 2015-03-30 15:56:01 -07:00
Seth Alves
8a5192c1d9 attempt to handle registration point in hull collisions 2015-03-30 11:22:31 -07:00
Seth Alves
dccedeadff diff minimization 2015-03-24 16:59:12 -07:00
Seth Alves
2f47f7c7ba diff minimization 2015-03-24 16:51:42 -07:00
Seth Alves
8d2c942509 diff minimization 2015-03-24 16:38:11 -07:00
Seth Alves
1eeb2e89f8 remove some debug spam 2015-03-24 16:23:51 -07:00
Seth Alves
6e3be26013 attempting to figure out why physics motion object doesn't get updated when collision model url changes 2015-03-24 15:28:21 -07:00
Seth Alves
c8ad82917e clean up some debugging spew. take dimensions into account when scaling points used for collision hull creation 2015-03-23 16:54:36 -07:00
Seth Alves
bfc5cf99d6 more code for compound hull collisions 2015-03-21 16:11:47 -07:00
Seth Alves
86d09a1607 more compound shape stuff 2015-03-21 08:55:49 -07:00
Seth Alves
769194f046 first stab at compound hull collisions 2015-03-20 13:41:14 -07:00
Seth Alves
1db9a9ef46 use .isEmpty on urls rather than convert them to strings and compare to empty string 2015-03-19 15:48:48 -07:00
Seth Alves
480eae7317 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-19 09:14:26 -07:00
Andrew Meadows
c032b29633 proper shape management for ConvexHull shapes 2015-03-18 16:29:57 -07:00
Seth Alves
1cab14064d remove unneeded code, quiet some debug spew 2015-03-18 13:10:53 -07:00
Seth Alves
36e0a5afc5 cleanups 2015-03-18 13:04:27 -07:00
Seth Alves
9161cc8b83 attempt to handle collision models in the same way as render models 2015-03-18 13:00:09 -07:00
Seth Alves
f9be7dda36 bump shape stuff from ModelEntityItem down to RenderableModelEntityItem 2015-03-17 18:55:13 -07:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Andrew Meadows
7836bb4dcd rayIntersection uses meters instead of tree units 2015-02-26 17:42:17 -08:00
Andrew Meadows
64c28fe925 remove EntityItem::getSize() 2015-02-26 15:36:59 -08:00
Andrew Meadows
8d4ea143ce easy conversions of: InDomainUnits --> InMeters 2015-02-25 14:48:06 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits() 
and friends
 2015-02-25 14:35:04 -08:00
Brad Hefta-Gaub
2eeb2a5ec5 Merge pull request #4205 from AndrewMeadows/isentropic 
small models get box collision shape
 2015-01-30 18:30:55 -08:00
Andrew Meadows
a723c748f5 check initialization of _needsInitialSimulation 2015-01-30 18:08:00 -08:00
Andrew Meadows
b035c5b082 fix for updating moving models 2015-01-30 14:16:32 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -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
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
Renamed from interface/src/entities/RenderableModelEntityItem.cpp (Browse further)