Commit graph

82 commits

Author SHA1 Message Date
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
Anthony J. Thibault
99a03bac21 Render a different model when in first person view.
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
ZappoMan
5abd608ccc fix typo 2015-06-16 15:55:37 -07:00
ZappoMan
1beb95cfe7 fix FPS while still maintaining ray picking 2015-06-16 15:38:16 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
ZappoMan
2c6ebcb06a remove a bunch of cruft from Model 2015-06-09 12:57:14 -07:00
ZappoMan
ba0cecb356 remove attachments from Model - only supported at avatar layer 2015-06-09 12:32:37 -07:00
Atlante45
90c9a82aeb Remove unnecesary debug 2015-06-09 15:27:08 +02:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02: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
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
ZappoMan
c4756f4816 remove dead code 2015-06-04 08:49:26 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07: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
ZappoMan
647d132d57 store part boxes in model space and translate to world space on request 2015-06-02 21:50:33 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
ZappoMan
1e2d2a2a99 calculate the actual bounding box for the mesh parts 2015-06-01 13:31:42 -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
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -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
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -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
Atlante45
591548dc38 Missing comma 2015-05-07 20:15:40 +02:00
Atlante45
863280300e Fix pickMeshList incorrect arguments 2015-05-05 22:37:00 +02:00
Atlante45
e0f3a8212f Add wireframe arg to render fct 2015-05-05 17:23:10 +02:00
Atlante45
bc04685dbf Add isWireframe to RenderKey 2015-05-05 15:15:18 +02:00
Atlante45
0e3061f052 Add isWireframe to model class 2015-05-05 15:14:29 +02:00
Brad Hefta-Gaub
50eecb15b3 Merge pull request #4712 from Atlante45/compound_zones_fix
Compound zones fix
2015-04-28 09:48:05 -07:00
Atlante45
b7263eeacf Added a more efficient convexHullContains to Model
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
2015-04-28 17:05:38 +02:00
Andrew Meadows
79cb55eabc rename setJointStates() --> initJointStates() 2015-04-24 13:26:26 -07:00
Sam Gateau
edb388ed83 Fixing the function with no implementation 2015-04-17 11:32:05 -07:00
Sam Gateau
f06556ba12 migrate the various list to sort the rendering from explicit names to a more generic key based map 2015-04-16 14:37:39 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Seth Alves
78af7f900e don't need _collisionGeometryScale 2015-04-01 18:23:25 -07:00
Seth Alves
8940ba0c2a new member variables related to rendering collision hulls 2015-04-01 17:52:18 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
ZappoMan
a889191916 never cull mesh parts for avatars 2015-03-31 14:27:34 -07:00
samcake
1a18719031 and make it compile on mac... remove the field map from state just because it's unecessary 2015-03-30 21:53:59 -07:00