Sam Gateau
|
3a93409080
|
Merging the day after the flight back to france, getting all the fixes
|
2015-06-04 23:02:05 -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
|
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 |
|
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 |
|
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 |
|
ZappoMan
|
750d9c0616
|
poor mans version of mesh part bounds
|
2015-06-01 12:53:09 -07:00 |
|
ZappoMan
|
ea31fdcc26
|
hacking on transparency
|
2015-06-01 11:53:40 -07:00 |
|
ZappoMan
|
4b46fc3ad9
|
cleanup Model::renderPart()
|
2015-06-01 11:11:27 -07:00 |
|
ZappoMan
|
1b8572640b
|
more hacking sams tweaks
|
2015-06-01 09:07:32 -07:00 |
|
ZappoMan
|
34fd1bd470
|
added debugging
|
2015-05-30 08:45:02 -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 |
|
Ryan Huffman
|
822ae800c5
|
Update Model::endScene to require RenderArgs
|
2015-05-22 16:17:01 -07:00 |
|
Ryan Huffman
|
8380eec03b
|
Update Model::renderCore to use RenderArgs
|
2015-05-22 16:10:43 -07:00 |
|
Ryan Huffman
|
d1a5662ca7
|
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
|
2015-05-22 15:33:40 -07:00 |
|
Ryan Huffman
|
3f22b5f8b3
|
Add RenderArgs to more render methods
|
2015-05-22 15:25:53 -07:00 |
|
Atlante45
|
6b9f9a32bb
|
Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program
|
2015-05-21 20:58:42 +02:00 |
|
Sam Gateau
|
3ec6ada29d
|
Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state
|
2015-05-19 00:32:36 -07:00 |
|
Howard Stearns
|
bb4df26690
|
Fix indentation.
|
2015-05-18 14:25:35 -07:00 |
|
Howard Stearns
|
95be605233
|
Typo: unlock=>lock in rednerDebugMeshBoxes.
|
2015-05-18 14:05:13 -07:00 |
|
Howard Stearns
|
7e1b6a48c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash
|
2015-05-18 13:35:28 -07:00 |
|
Howard Stearns
|
f2a66f3106
|
Simplest fix for the grab crash that occurs with animated complex models.
(e.g., clicking on air hockey props in front of a spinning windmill).
|
2015-05-18 13:08:11 -07:00 |
|
ZappoMan
|
1bb682180c
|
workaround for segregateMeshGroups() crash
|
2015-05-18 12:24:18 -07:00 |
|
Atlante45
|
e51040db53
|
CR
|
2015-05-11 14:31:22 +02:00 |
|
Atlante45
|
52397bf87a
|
Fix wireframe render for meshes with special properties
|
2015-05-08 15:59:39 +02:00 |
|
Atlante45
|
00571dad00
|
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
|
2015-05-07 10:13:59 +02:00 |
|
samcake
|
06e1330e42
|
Clean up the includes in gpu, make the skybox shader works
|
2015-05-06 12:12:54 -07:00 |
|
Atlante45
|
8b2442ce6e
|
clear list after loop
|
2015-05-05 22:56:37 +02:00 |
|
Atlante45
|
863280300e
|
Fix pickMeshList incorrect arguments
|
2015-05-05 22:37:00 +02:00 |
|
Atlante45
|
73b7530ec6
|
Add wireframe pipelines
|
2015-05-05 21:50:06 +02:00 |
|