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
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
ab9d81b5e2
Correct comments
2015-04-28 18:09:09 +02: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
Atlante45
4911aa58bc
Fix Model setURL with delayload
...
Without this condition the model stays in a state where the geometry
is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
2015-04-28 17:02:32 +02:00
Andrew Meadows
72deb2e49b
merge upstream/master into andrew/thermonuclear
...
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -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
Atlante45
ba507cef98
Fix a few warnings
2015-04-25 11:01:02 +02:00
Andrew Meadows
79cb55eabc
rename setJointStates() --> initJointStates()
2015-04-24 13:26:26 -07:00
Sam Gateau
58c1827f69
bring back the glPushPop in transform legacy mode
2015-04-20 15:56:44 -07:00
Sam Gateau
3872c01340
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-04-16 14:38:18 -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
Brad Davis
d72bb71030
Merge pull request #4636 from samcake/orange
...
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
2015-04-16 13:39:04 -07:00
Sam Gateau
87030236cb
working version with the gpu::SAmpler and the gpu::Framebuffer
2015-04-14 15:53:24 -07:00
Andrew Meadows
9388ae4212
fix warning about unused variable
2015-04-14 14:52:21 -07:00
Sam Gateau
c34c5f6075
adding the Fremabuffer to be used for shadows and main rendering
2015-04-14 08:47:52 -07:00
Sam Gateau
f0efade06d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c
Merge pull request #4601 from samcake/temp1
...
Introducing gpu::State and using it in the Model rendering path and more...
2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1
Merge branch 'temp1' of https://github.com/samcake/hifi into orange
2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9
Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly
2015-04-07 11:20:55 -07:00
Sam Gateau
88afb3cedc
solution to the color attribute case
2015-04-07 10:04:51 -07:00
Seth Alves
cd5245d0d6
logging group for render-utils
2015-04-06 18:16:01 -07:00
Sam Gateau
7f46736bb4
playing with the shadwos
2015-04-06 17:17:25 -07:00
Sam Gateau
7de54917b8
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7
trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct
2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41
COmmented the review questions in code
2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013
FIxed the broken shadows
2015-04-03 17:58:21 -07:00
Sam Gateau
38d1e29a1d
getting ready for pr for a few syntax issues
2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4
getting ready for pr for a few syntax issues
2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7
getting ready for pr for a few syntax issues
2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10
FInd one of the issue with shadows for avatars
2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2
mirror means we render the Closkwise side
2015-04-03 10:45:30 -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
57a4f3abe3
clear _saveNonCollisionGeometry when it's not needed, remove some debug prints
2015-04-02 06:57:27 -07:00
Seth Alves
eb78fa0f85
if switching to the mode where collision hulls are drawn, updateGeometry and simulate
2015-04-01 18:24:25 -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
Sam Gateau
2a58a65a8f
back to the office monday morning, State almost working in the full piupeline
2015-03-30 10:10:39 -07:00
Sam Gateau
21b5d6f404
refining the state interface and the GLBackend for it with a true cache
2015-03-28 11:26:06 -07:00
Sam Gateau
9c44100bb8
cleaning the State class code
2015-03-27 10:33:29 -07:00
Seth Alves
7da87d6e15
set up a way to request ResourceCache downloads from a non-networking thread.
2015-03-26 18:37:55 -07:00
Sam Gateau
c9e0360394
using gpu::Pipeline it s mostly working but still glUniforms to get rid of
2015-03-26 13:48:49 -07:00
Sam Gateau
8938a6297f
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-25 10:16:43 -07:00
Sam Gateau
c9377d0811
the model renderer now uses the map of renderPIpeline and the pipeline object of gpu, yeah. fixed the state to do the basics glState stuff correctly
2015-03-25 10:16:18 -07:00
Sam Gateau
6284159892
Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline
2015-03-24 14:58:41 -07:00
ZappoMan
168e8e8b80
more fixes to avatar parts not rendering
2015-03-24 08:31:45 -07:00
ZappoMan
3e8508f149
CR feedback
2015-03-23 11:13:35 -07:00
