ZappoMan
|
ba0cecb356
|
remove attachments from Model - only supported at avatar layer
|
2015-06-09 12:32:37 -07:00 |
|
Brad Hefta-Gaub
|
759a4a323b
|
Merge pull request #5087 from Atlante45/debug
Reduce debug on domain connection
|
2015-06-09 07:54:21 -07:00 |
|
Atlante45
|
90c9a82aeb
|
Remove unnecesary debug
|
2015-06-09 15:27:08 +02:00 |
|
Seth Alves
|
fb7a0e7219
|
back out previous change, fix error where translucent is used instead of translucentMesh
|
2015-06-08 22:41:59 -07:00 |
|
Seth Alves
|
983ae5b2f0
|
quiet compiler, fix some whitespace
|
2015-06-08 21:19:37 -07:00 |
|
samcake
|
5e351c0328
|
FIxing the transparent rendering on Mac
|
2015-06-08 18:36:12 +02:00 |
|
Sam Gateau
|
054809d570
|
clean code for PR
|
2015-06-08 05:51:23 -07:00 |
|
Sam Gateau
|
3196c5ca77
|
better highlights blending
|
2015-06-08 05:41:36 -07:00 |
|
Sam Gateau
|
de61f4ea0b
|
Gettting th ehighlight on transparent to work
|
2015-06-08 02:52:13 -07:00 |
|
Sam Gateau
|
8d3a3221b0
|
shuffling the rendering steps to get to render transparent and light it correctly
|
2015-06-06 09:50:56 -07:00 |
|
Ryan Huffman
|
b22ed34825
|
Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset
TEAM TEACHING - improvements to avatar part clipping
|
2015-06-05 09:26:45 -07:00 |
|
ZappoMan
|
d60810e221
|
CR feedback
|
2015-06-05 09:10:38 -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 |
|
Sam Gateau
|
aa5e6fa1b0
|
merging
|
2015-06-05 00:41:29 -07:00 |
|
Sam Gateau
|
3a93409080
|
Merging the day after the flight back to france, getting all the fixes
|
2015-06-04 23:02:05 -07:00 |
|
ZappoMan
|
5146e51d9f
|
improvements to avatar part clipping
|
2015-06-04 16:44:46 -07:00 |
|
Ryan Huffman
|
cafc5b7a7c
|
Merge pull request #5049 from ZappoMan/team-teaching-optimize-offset
TEAM TEACHING - avatar changing model URLs
|
2015-06-04 14:29:44 -07:00 |
|
Brad Hefta-Gaub
|
5e6771d91a
|
Merge pull request #5048 from huffman/entity-visible
Team Teaching - Update entity payload items to not render when entity.visible == false
|
2015-06-04 14:12:49 -07:00 |
|
ZappoMan
|
56ac987c9b
|
handle url reloading at the model level, this addresses avatars changing their models
|
2015-06-04 13:40:43 -07:00 |
|
Ryan Huffman
|
a62b55fcb2
|
Update entity payload items to correctly hide when not visible
|
2015-06-04 13:25:40 -07:00 |
|
ZappoMan
|
3593afea3b
|
optimize part offset calculation
|
2015-06-04 11:37:02 -07:00 |
|
Atlante45
|
94ba84a84c
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
|
2015-06-04 18:48:15 +02:00 |
|
Atlante45
|
93b44e6846
|
Collect stats on translucent/opaque mesh parts
|
2015-06-04 18:46:47 +02:00 |
|
Brad Hefta-Gaub
|
50f44c801a
|
Merge pull request #5045 from Atlante45/fix_world_box
Team Teaching - Temporary fix for models index offset
|
2015-06-04 09:16:31 -07:00 |
|
Atlante45
|
8e21d9c14b
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
|
2015-06-04 18:11:17 +02:00 |
|
Atlante45
|
31d257db09
|
Temporary fix for models index offset
|
2015-06-04 17:58:44 +02:00 |
|
ZappoMan
|
c4756f4816
|
remove dead code
|
2015-06-04 08:49:26 -07:00 |
|
Atlante45
|
a4340b17e9
|
Remove deprecated render stats
|
2015-06-04 14:47:04 +02:00 |
|
Sam Gateau
|
fabe8f1a7a
|
Fixing the skinned mesh rendering issue
|
2015-06-03 23:18:24 -07:00 |
|
Sam Gateau
|
dfa8cb5c80
|
Fixing the skinned mesh rendering issue
|
2015-06-03 23:11:14 -07:00 |
|
ZappoMan
|
54c4cb829a
|
fixed the shrunken avatar part bug
|
2015-06-03 21:49:48 -07:00 |
|
ZappoMan
|
c6fb22b915
|
make sure all entities are rendering in pipeline part 1
|
2015-06-03 17:16:45 -07:00 |
|
ZappoMan
|
7fde574a2a
|
make model overlays acutally use sub mesh payload items
|
2015-06-03 16:33:58 -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
|
9e7f60e6a3
|
add more guards against out of bounds
|
2015-06-02 22:17:39 -07:00 |
|
ZappoMan
|
a7feca0727
|
more work on making avatar models (face included) use render payloads
|
2015-06-02 22:10:00 -07:00 |
|
ZappoMan
|
647d132d57
|
store part boxes in model space and translate to world space on request
|
2015-06-02 21:50:33 -07:00 |
|
ZappoMan
|
c9c434bc8c
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
|
2015-06-02 21:04:33 -07:00 |
|
ZappoMan
|
adcb62eb18
|
more hacking and cleanup
|
2015-06-02 21:03:34 -07:00 |
|
Sam Gateau
|
640071dd35
|
Avoiding any setVIewTransform in payloadREnder and introducing monitoring values
|
2015-06-02 18:23:53 -07:00 |
|
ZappoMan
|
4ce27f1483
|
first cut at rendering avatars as individual model items
|
2015-06-02 16:54:47 -07:00 |
|
Sam Gateau
|
903837ab4f
|
exposing some controls on the engine to js for debugging
|
2015-06-02 15:57:37 -07:00 |
|
Sam Gateau
|
3c7eb4de6d
|
merging with upstream
|
2015-06-02 14:48:53 -07:00 |
|
Sam Gateau
|
453fa87654
|
making sure the proj and view matrix are correctly assigned
|
2015-06-02 14:31:40 -07:00 |
|
Sam Gateau
|
901717fb2c
|
trying to fix the issues of model disappearing
|
2015-06-02 11:52:22 -07:00 |
|
Sam Gateau
|
ef2d8a0dbe
|
tuesday morning rendering poor performances networking issue
|
2015-06-02 10:58:56 -07:00 |
|
Atlante45
|
6d234a20ad
|
Hack for unknown pipelines
|
2015-06-02 19:07:57 +02:00 |
|
Sam Gateau
|
bd7c22e715
|
Trying to transfer the rnedering from displaySide to RenderDeferredTask
|
2015-06-01 17:31:00 -07:00 |
|
ZappoMan
|
1e2d2a2a99
|
calculate the actual bounding box for the mesh parts
|
2015-06-01 13:31:42 -07:00 |
|