ZappoMan
|
9631761f70
|
get sphere normals correct
|
2015-01-27 21:39:59 -08:00 |
|
ZappoMan
|
e7742351b7
|
get sizing for spheres to work properly
|
2015-01-27 20:30:58 -08:00 |
|
ZappoMan
|
9152865116
|
first cut at supporting streamized spheres
|
2015-01-21 16:56:41 -08:00 |
|
ZappoMan
|
44b48bab5e
|
remove some dead code we don't use
|
2015-01-19 18:15:47 -08:00 |
|
ZappoMan
|
2b2bd3cb47
|
more work on renderGrid with color
|
2015-01-19 18:08:34 -08:00 |
|
ZappoMan
|
0ae695ecf3
|
first cut at renderGrid with color
|
2015-01-19 16:54:43 -08:00 |
|
ZappoMan
|
27268a6489
|
fix updateVertices to correctly copy all data
|
2015-01-19 15:43:20 -08:00 |
|
ZappoMan
|
ef82aac7a5
|
removed some debug, fixed a type mismatch for vec2 vs vec3
|
2015-01-19 14:48:19 -08:00 |
|
ZappoMan
|
bddb7856af
|
more work
|
2015-01-19 13:34:09 -08:00 |
|
ZappoMan
|
439a1c0495
|
solid cube now streamizing
|
2015-01-15 18:46:44 -08:00 |
|
ZappoMan
|
daafa20ec6
|
first cut at moving wire cube to support gpu streams
|
2015-01-15 17:00:08 -08:00 |
|
ZappoMan
|
149f365410
|
fix colors for renderBevelCornersRect()
|
2015-01-15 11:55:45 -08:00 |
|
ZappoMan
|
72f2e6f3aa
|
work on colored quads
|
2015-01-15 11:37:53 -08:00 |
|
ZappoMan
|
db94949649
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/avatar/SkeletonModel.cpp
|
2015-01-14 17:55:03 -08:00 |
|
ZappoMan
|
e6388a65b9
|
rough pass at adding color to geometry cache
|
2015-01-13 20:53:05 -08:00 |
|
Atlante45
|
f77fab2fe0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
|
2015-01-13 20:38:52 -08:00 |
|
ZappoMan
|
1b0a5c881b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
|
2015-01-13 16:14:29 -08:00 |
|
Atlante45
|
2a82ff9768
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
|
2015-01-13 11:03:14 -08:00 |
|
Atlante45
|
74d819fe25
|
Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating
|
2015-01-12 16:42:35 -08:00 |
|
Atlante45
|
8415098fc2
|
Set different caches size depending on cache type
|
2015-01-12 15:36:36 -08:00 |
|
chris
|
8bb69d0a90
|
Update std::string instances to QString
|
2015-01-09 16:22:52 -08:00 |
|
ZappoMan
|
17e48554d8
|
implement support for proper cleanup in BatchItemDetails
|
2015-01-09 15:06:11 -08:00 |
|
ZappoMan
|
a03c2b79fa
|
first cut at adding colors to GeometryCache and supporting batch internally
|
2015-01-08 15:52:33 -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 |
|
ZappoMan
|
4ea9bbc309
|
first major pass at voxelEctomy
|
2014-12-30 18:08:58 -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 |
|
ZappoMan
|
be137534b5
|
first cut at registered quads to reduce copies of constantly changing quads
|
2014-12-30 12:38:16 -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
|
0790bd77b7
|
almost completely eliminate immediate mode QUADS
|
2014-12-24 11:14:50 -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 |
|
Atlante45
|
327daacecd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
|
2014-12-22 13:34:18 -08:00 |
|
ZappoMan
|
8091564a73
|
remove all glut
|
2014-12-18 16:12:30 -08:00 |
|
Atlante45
|
296c0025de
|
Switched to auto and changed macro
|
2014-12-18 15:42:38 -08:00 |
|
ZappoMan
|
26bcca95c9
|
remove glutWireCube()
|
2014-12-18 15:42:02 -08:00 |
|
ZappoMan
|
11b4400099
|
move all glut-ness to geometry cache
|
2014-12-18 11:20:17 -08:00 |
|
ZappoMan
|
ef42203481
|
add wire cube implementation to GeometryCache and DeferredLightingEffect
|
2014-12-17 15:58:52 -08:00 |
|
Atlante45
|
11a2ecab56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/entities/EntityTreeRenderer.h
interface/src/ui/ApplicationOverlay.cpp
libraries/render-utils/src/GlowEffect.cpp
libraries/render-utils/src/Model.cpp
|
2014-12-16 15:02:37 -08:00 |
|
ZappoMan
|
49cacd85bd
|
move GeometryCache to library
|
2014-12-15 14:00:41 -08:00 |
|