Bradley Austin Davis
89aa596717
Fix white rendering of many primitives
2015-08-04 14:05:05 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
ZappoMan
b02f751830
diff redux
2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f
use Austins QUAD to TRIANGLE_STRIP approach
2015-08-01 16:50:36 -07:00
ZappoMan
1dd6c1117d
change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive
2015-08-01 11:29:28 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Howard Stearns
1663d095a1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-24 14:08:51 -07:00
Andrew Meadows
1bf49d72f1
Merge branch 'rig' of github.com:howard-stearns/hifi into bromine
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-07-24 10:06:02 -07:00
samcake
52ac5b3ef6
On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize
2015-07-24 03:38:21 -07:00
Sam Gateau
66cd17ec66
REmove the crappy solution for drawing transparent texture into overlay by a proper shader
2015-07-23 23:09:40 -07:00
Sam Gateau
dc10f30d3d
Merged
2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3
Render the rear view mirror in a separate target and then display it during overlay pass
2015-07-23 14:56:14 -07:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Marcel Verhagen
8f0893ba21
Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
...
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.
So it now does not break existing content.
Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
ZappoMan
d41d86c33c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-07-20 14:31:58 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
ZappoMan
816fd41624
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-07-17 17:10:52 -07:00
Brad Hefta-Gaub
2423d25839
Merge pull request #5355 from ctrlaltdavid/20620
...
QA for #20620 - Make renderGrid handle changing position and dimensions
2015-07-17 17:10:43 -07:00
David Rowe
c46533d9a6
Make renderGrid handle changing position and dimensions
...
So that audio scope grid moves when Interface window is resized.
2015-07-16 21:05:14 -07:00
ZappoMan
398075e45a
hacking on more naked GL
2015-07-16 16:26:28 -07:00
ZappoMan
2ad2c4d554
remove some dead code
2015-07-15 15:33:28 -07:00
ZappoMan
293ccc1713
remove some dead code
2015-07-15 15:32:02 -07:00
ZappoMan
d19c7125da
remove naked gl calls
2015-07-14 16:49:43 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Atlante45
5cfa1605df
Made Texture safe with resource refresh
2015-07-10 12:28:06 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Sam Gateau
c41ebcae78
Covering all the case for rendering the light passes
2015-06-26 15:40:08 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Seth Alves
f284e9d070
quiet compiler
2015-06-22 07:18:30 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Atlante45
26e8c490c3
constexpr not handled on windows
2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7
Make array size a constexpr
2015-06-18 15:23:53 +02:00
Atlante45
8a3a7e5b7f
Reorder triangle strip
2015-06-18 15:23:50 +02:00
Atlante45
70a020c7e3
BevelRect use triangle strips
2015-06-18 15:23:49 +02:00
Atlante45
bdaf8a8a32
Fix bevel quads
2015-06-18 15:22:48 +02:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
