Commit graph

90 commits

Author SHA1 Message Date
Atlante45
08317b51da Use removeUnusedResources 2015-01-12 11:12:50 -08:00
ZappoMan
1bc91e7d29 removed renderTriangleProxies 2015-01-06 16:01:06 -08:00
ZappoMan
1bfce7d876 more removal of immediate mode 2015-01-06 14:14:13 -08:00
ZappoMan
ac1f7c9a84 multi-mode renderVertices 2015-01-06 09:52:27 -08:00
ZappoMan
570607c044 renderLines 2015-01-06 08:58:41 -08:00
ZappoMan
0606861b66 dashed lines in GeometryCache 2015-01-05 21:45:17 -08:00
ZappoMan
a9b7367fa9 more work on eliminating immediate mode calls 2015-01-05 20:51:05 -08:00
ZappoMan
9545bd1907 add alternate renderGrid for audio scope 2015-01-05 19:34:37 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
ZappoMan
a20fa1242d first cut are removing immediate mode GL_LINES 2015-01-05 15:46:48 -08:00
ZappoMan
c2d45df541 add renderBevelCornersRect to GeometryCache 2015-01-05 14:39:14 -08:00
Sam Gateau
f03b253260 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy
Voxel ectomy
2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0 clean code 2015-01-05 13:17:12 -08:00
Sam Gateau
7529b3d1b0 clean code 2015-01-05 13:10:32 -08:00
dev
e3d474db3d FIx shaders for mac 2015-01-05 12:27:16 -08:00
Sam Gateau
b8e44a3e7a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -08:00
Philip Rosedale
a01ab38f1b Merge pull request #4029 from Atlante45/new_glm_fix
Fix compile error with new glm version
2015-01-04 11:26:37 -08:00
ZappoMan
139f96c8b0 remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe 2015-01-02 14:41:09 -08:00
Sam Gateau
46ab4833be applying the shadowing improvment to the cascaceded path shader and cleaning the code 2015-01-02 12:12:41 -08:00
Sam Gateau
24d39f4453 refining the shadowing 2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Atlante45
b1f0ec8dfb Fix compile error with new glm version 2014-12-31 15:49:56 -08:00
Sam Gateau
02949dbc5a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-31 10:59:42 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
samcake
20d66d201e Merge pull request #4020 from ZappoMan/gpuStreamizing
Improvements to GeometryCache::renderQuad()
2014-12-30 16:49:16 -08:00
Clément Brisset
860098585c Merge pull request #4018 from samcake/temp0
Moving the shaders used in Model.cpp from resources folder into the built-in executable
2014-12-30 13:36:13 -08:00
ZappoMan
4e6ed4a449 fix comments 2014-12-30 13:26:13 -08:00
ZappoMan
28569836bb rename parameters and reuse previously registered quad if geometry didn't change 2014-12-30 13:24:31 -08:00
Sam Gateau
a022e94814 Adding the shader files 2014-12-30 12:38:36 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
ZappoMan
53a7d83f35 CR feedback spacing 2014-12-30 10:33:22 -08:00
ZappoMan
cb951763fd CR feedback spacing 2014-12-30 10:29:18 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
Sam Gateau
6628f7b811 replace the model.frag and model.vert files from resource by the sl version of the shaders 2014-12-25 19:57:27 -08:00
ZappoMan
0790bd77b7 almost completely eliminate immediate mode QUADS 2014-12-24 11:14:50 -08:00
dev
42157161e0 fix the c++ header generation for mac though the brand new raw string format of c++11 2014-12-23 18:19:25 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
ZappoMan
1f307e9667 more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Stephen Birarda
715b3a245e remove GLUT from Cmake files 2014-12-19 10:53:36 -08:00
Stephen Birarda
504cd86fef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 09:13:06 -08:00