Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 03:16:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26373 commits 74 branches 59 tags 1.2 GiB
Commit graph

638 commits

Author SHA1 Message Date
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
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
Ryan Huffman
5af52048ec Add render/Scene.h include to Model.h 2015-06-04 13:45:10 -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
ZappoMan
d2deef97cc Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-04 09:24:37 -07: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
ZappoMan
54c4cb829a fixed the shrunken avatar part bug 2015-06-03 21:49:48 -07:00
Brad Davis
a12fd5c3d0 Merge pull request #5023 from AndrewMeadows/bispinor 
fix crash in ~OffscreenGlCanvas on linux shutdown
 2015-06-03 17:21:39 -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
7654533888 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -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
8bf08b34d7 Trying to get Ubuntu to build... again 2015-06-02 19:37:54 -07:00
Sam Gateau
eea7ddf491 Trying to get Ubuntu to build 2015-06-02 19:27:32 -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
Andrew Meadows
9e0c2a3c6c fix crash in ~OffscreenGlCanvas on linux shutdown 2015-06-02 14:36:34 -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
cd7914ad9d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Sam Gateau
1b22f1f147 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 13:56:13 -07:00
samcake
50f3d2d12b Merge pull request #5014 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - report correct part bounds
 2015-06-01 13:55:55 -07:00
ZappoMan
1e2d2a2a99 calculate the actual bounding box for the mesh parts 2015-06-01 13:31:42 -07:00
ZappoMan
750d9c0616 poor mans version of mesh part bounds 2015-06-01 12:53:09 -07:00
Sam Gateau
c8e30ef39e On to a full rendered pipeline 2015-06-01 12:35:54 -07:00