Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
3f258c89b4
Fix transition from AG+Rig to AG only.
2015-09-04 11:03:59 -07:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db
Merge pull request #5684 from rabedik/fxaa
...
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Raffi Bedikian
6b2897ca8f
Fix AA bugs with display plugins and mini-mirror
2015-09-03 23:11:53 -07:00
Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
Anthony J. Thibault
30264e9c3d
Added animation debug draw items to menu.
...
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
2015-09-02 21:04:29 -07:00
Raffi Bedikian
2d95d1c236
Fix various whitespace issues
2015-09-02 13:49:21 -07:00
Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Raffi Bedikian
9318661bc3
Add algorithm comments to FXAA shader
2015-09-01 23:54:48 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Andrew Meadows
fe2d03fd37
merge
...
Conflicts:
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
libraries/shared/src/GLMHelpers.cpp
2015-09-01 11:17:08 -07:00
Anthony J. Thibault
2401e6cc4b
Merge branch 'master' into ajt/new-anim-system
2015-09-01 10:58:38 -07:00
Seth Alves
7b6d267c06
Merge pull request #5675 from AndrewMeadows/darmstadtium
...
remove PhysicsEntity class
2015-09-01 10:06:01 -07:00
Stephen Birarda
fa0abe2972
resolve conflicts on merge with upstream/master
2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Raffi Bedikian
ff2a58b3eb
Add FXAA effect class, modeled after AO effect
2015-08-30 20:49:03 -07:00
Raffi Bedikian
1001cf9000
Add shader files for FXAA
2015-08-30 20:48:06 -07:00
Andrew Meadows
614fad0811
remove warnings from linux build
2015-08-27 19:12:25 -07:00
Stephen Birarda
8ea20b5e5e
fix warning on string literal call to qFatal
2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892
remove PhysicsEntity class
2015-08-27 18:22:12 -07:00
Stephen Birarda
8ee27bca2b
remove urlAsString from Model
2015-08-27 16:00:21 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Ryan Huffman
755c33e551
Remove unused variable
2015-08-27 14:11:40 -07:00
Ryan Huffman
24eef654e0
Remove unnecessary debug
2015-08-27 14:11:29 -07:00
Ryan Huffman
750080fe66
Remove early return in Model::restoreJointPosition
2015-08-27 12:52:01 -07:00
Anthony J. Thibault
778521f664
Improvement to bone link rendering when bones are large.
2015-08-27 10:21:23 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Ryan Huffman
269d5bb6da
Resolve bugs with *Cache changes
2015-08-26 14:04:55 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Anthony J. Thibault
bde75e9e51
AnimDebugDraw rendering works again.
...
I had to port AnimDebugDraw shader to GLSL 4.1.
2015-08-24 17:36:21 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084
Added overload for renderDashedLine
2015-08-24 16:07:07 +01:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -07:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
ZappoMan
75aff2f281
fix atmosphere rendering
2015-08-21 00:29:28 -07:00
