Commit graph

91 commits

Author SHA1 Message Date
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
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