Andrzej Kapolka
|
e6f37544fd
|
Use deferred lighting for voxels as well as metavoxels.
|
2014-09-11 18:06:56 -07:00 |
|
Andrzej Kapolka
|
c2b58c9781
|
Move deferred lighting into its own class.
|
2014-09-11 16:39:17 -07:00 |
|
Andrzej Kapolka
|
fe249ef348
|
Make sure the frustum that we use for culling contains the current camera
information.
|
2014-09-10 15:51:10 -07:00 |
|
Andrzej Kapolka
|
34ccc2ab7b
|
Use the FBO dimensions, which may differ from the widget dimensions (as with
the Oculus).
|
2014-09-10 15:13:07 -07:00 |
|
Andrzej Kapolka
|
2fde67be72
|
Fix for deferred lighting with 3DTV (/Oculus, although I haven't tested that
yet).
|
2014-09-10 12:40:03 -07:00 |
|
Andrew Meadows
|
4da1ca22ba
|
Add RayIntersectionInfo and use for shape-vs-ray
|
2014-09-09 17:35:06 -07:00 |
|
Andrzej Kapolka
|
c340445f33
|
Hopefully, a fix for the Windows build; looks like "near" is a keyword.
|
2014-09-04 17:42:33 -07:00 |
|
Andrzej Kapolka
|
137d3738fc
|
Fix for preview render.
|
2014-09-04 17:23:09 -07:00 |
|
Andrzej Kapolka
|
21f3f2b90e
|
Switch to deferred lighting for metavoxels.
|
2014-09-04 17:17:44 -07:00 |
|
Andrzej Kapolka
|
a02656070f
|
Added some comments.
|
2014-09-03 14:43:11 -07:00 |
|
Andrzej Kapolka
|
0bd800faf2
|
Starting on materials attributes, fixed bug with Hermite deltas.
|
2014-09-03 14:09:04 -07:00 |
|
Andrzej Kapolka
|
926f0d099c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-09-02 14:03:48 -07:00 |
|
Andrzej Kapolka
|
34ba5cc31f
|
More shader fixes.
|
2014-09-02 13:54:47 -07:00 |
|
Andrzej Kapolka
|
4e561c69b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-09-02 12:32:57 -07:00 |
|
Andrzej Kapolka
|
bf5e5fd72c
|
Quick fix for base colors underneath terrain.
|
2014-09-02 12:31:25 -07:00 |
|
Andrzej Kapolka
|
fa06bef556
|
More dual contour bits.
|
2014-08-29 18:00:11 -07:00 |
|
Andrzej Kapolka
|
120563951d
|
Fixed bug in edge vertex generation.
|
2014-08-29 12:10:25 -07:00 |
|
Andrzej Kapolka
|
78a03fb31a
|
More progress toward dual contour rendering.
|
2014-08-28 20:01:55 -07:00 |
|
Andrzej Kapolka
|
f02f95c460
|
Hermite data computation.
|
2014-08-28 14:53:48 -07:00 |
|
Andrzej Kapolka
|
96b4a1080c
|
More voxel editing bits.
|
2014-08-27 18:15:29 -07:00 |
|
Andrzej Kapolka
|
9a4d56b4e9
|
Working on voxel bits.
|
2014-08-27 14:41:23 -07:00 |
|
Andrzej Kapolka
|
e454a08e57
|
HeightfieldTexture -> MaterialObject (we want to use it for voxels, too, and
eventually include components other than diffuse color).
|
2014-08-25 18:57:45 -07:00 |
|
Andrzej Kapolka
|
7aa2a1d53f
|
Working on voxel representations.
|
2014-08-25 15:44:12 -07:00 |
|
Andrzej Kapolka
|
2dfabdfe64
|
Support for scaling splat textures in S and T, use mipmaps for them.
|
2014-08-22 16:43:09 -07:00 |
|
Andrzej Kapolka
|
5c77317cfd
|
Fix for flashing when painting textures.
|
2014-08-21 18:07:30 -07:00 |
|
Andrzej Kapolka
|
6e06b63709
|
For splat textures, use transparent white as a default.
|
2014-08-21 16:33:09 -07:00 |
|
Andrzej Kapolka
|
72500630b0
|
Basic splatting.
|
2014-08-20 19:26:06 -07:00 |
|
Andrzej Kapolka
|
416d9bac2e
|
Working on texture rendering.
|
2014-08-20 14:48:02 -07:00 |
|
Andrzej Kapolka
|
7cf7f188f8
|
Yet more texture bits.
|
2014-08-19 18:55:18 -07:00 |
|
Andrzej Kapolka
|
e854656a7f
|
Rather than using a boolean to indicate "colorness," use a different class.
More texture bits.
|
2014-08-19 14:20:47 -07:00 |
|
Andrzej Kapolka
|
668f6d3cfd
|
Support for shadows on heightmaps.
|
2014-08-15 16:13:47 -07:00 |
|
Andrzej Kapolka
|
05d6b628fa
|
Alllmost ready with the big edge sharing rejiggery.
|
2014-08-14 17:10:45 -07:00 |
|
Andrzej Kapolka
|
8c42a3a848
|
Ray query fix.
|
2014-08-13 11:30:05 -07:00 |
|
Andrzej Kapolka
|
56c6c3c972
|
Working on the height/ray queries.
|
2014-08-13 11:05:48 -07:00 |
|
Andrzej Kapolka
|
21d6c3c48a
|
More work on edge rejiggery.
|
2014-08-12 18:21:04 -07:00 |
|
Andrzej Kapolka
|
ee01d85b5e
|
Attempting to remove some number magic.
|
2014-08-12 12:01:07 -07:00 |
|
Andrzej Kapolka
|
2c0f8ff57e
|
Working on rejiggering the heightfield tiles.
|
2014-08-12 10:56:15 -07:00 |
|
Andrzej Kapolka
|
18256a657e
|
Removed unused uniform.
|
2014-08-08 14:25:02 -07:00 |
|
Andrzej Kapolka
|
b7b1b018ee
|
No need to use a texture for the cursor; we can just use a fragment shader.
|
2014-08-08 11:24:57 -07:00 |
|
Andrzej Kapolka
|
0fc34a47aa
|
Show heightfield cursor.
|
2014-08-07 18:19:58 -07:00 |
|
Andrzej Kapolka
|
4696832ec6
|
Compute heightfield normals from adjacent values in vertex shader.
|
2014-08-05 15:13:50 -07:00 |
|
Andrzej Kapolka
|
c42fc15999
|
Use back face culling on the heightfields.
|
2014-08-05 11:13:15 -07:00 |
|
Andrzej Kapolka
|
46d4172157
|
Filter terrain, points, spanners by frustum intersection.
|
2014-08-04 11:41:56 -07:00 |
|
Andrzej Kapolka
|
a0886d4301
|
Use raw OpenGL textures rather than QOpenGLTexture, since that we're having
issues with constants in that class.
|
2014-07-31 11:55:52 -07:00 |
|
Andrzej Kapolka
|
c3c2265ddd
|
Hide the unset (black) bits.
|
2014-07-30 18:14:11 -07:00 |
|
Andrzej Kapolka
|
82e442c115
|
Working on heightfield transmission, merging.
|
2014-07-30 14:54:38 -07:00 |
|
Andrzej Kapolka
|
1ea9b0ccbc
|
Working on heightfield encoding.
|
2014-07-29 19:13:43 -07:00 |
|
Andrzej Kapolka
|
6824479762
|
Progress on rendering heightfield buffers.
|
2014-07-29 16:06:35 -07:00 |
|
Andrzej Kapolka
|
d04eb6261e
|
More work on heightfields.
|
2014-07-29 14:27:51 -07:00 |
|
Andrzej Kapolka
|
aeee369286
|
Working on heightfield implementation.
|
2014-07-28 19:10:59 -07:00 |
|
Andrzej Kapolka
|
cc909e2286
|
Fixed spelling error.
|
2014-07-28 16:24:49 -07:00 |
|
Andrzej Kapolka
|
e05884d4a3
|
Simpler rendering.
|
2014-07-28 16:18:16 -07:00 |
|
Andrzej Kapolka
|
4f5448f529
|
Basic rendering working again.
|
2014-07-25 18:19:50 -07:00 |
|
Andrzej Kapolka
|
57ca606491
|
Various kinds of progress towards generic rendering.
|
2014-07-25 16:59:48 -07:00 |
|
Andrzej Kapolka
|
605b3282e7
|
Working on render bits.
|
2014-07-24 17:01:15 -07:00 |
|
Andrzej Kapolka
|
5bd3d1fe20
|
Working on renderer attribute.
|
2014-07-24 13:16:18 -07:00 |
|
Andrzej Kapolka
|
27f88e9f80
|
Progress on threading.
|
2014-07-23 18:20:00 -07:00 |
|
Andrzej Kapolka
|
0ddd3e650c
|
More point bits (trying a different tack).
|
2014-07-21 19:00:13 -07:00 |
|
Andrzej Kapolka
|
dd7f3703e1
|
More work on point rendering.
|
2014-07-21 14:48:54 -07:00 |
|
Andrzej Kapolka
|
38f3f80398
|
More work on point rendering.
|
2014-07-18 18:51:01 -07:00 |
|
Andrzej Kapolka
|
cda1a7f32a
|
Working on optimized point rendering.
|
2014-07-18 12:27:51 -07:00 |
|
Andrzej Kapolka
|
28dbb60e7e
|
Working on post-visit callback.
|
2014-07-16 19:14:38 -07:00 |
|
Andrzej Kapolka
|
64c3a623f4
|
Working on point buffer building.
|
2014-07-16 17:56:22 -07:00 |
|
Andrzej Kapolka
|
d858e20af2
|
For now, tie the metavoxel LOD threshold to the avatar LOD parameter.
|
2014-07-10 16:02:53 -07:00 |
|
Andrzej Kapolka
|
f16098daef
|
Use the refactored endpoint/client classes in the actual client/server.
|
2014-06-26 19:11:54 -07:00 |
|
Andrzej Kapolka
|
4b2d122f3d
|
Working on factoring out the common metavoxel endpoint/client code.
|
2014-06-26 16:12:11 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Andrzej Kapolka
|
5a61009099
|
Add metavoxel bandwidth to details.
|
2014-04-08 10:19:39 -07:00 |
|
Andrzej Kapolka
|
15e9d45dc3
|
Switched from storing Euler angles to using quaternions along with a
quaternion editor. Also, use a default step of 0.01 for floats/doubles.
|
2014-04-07 15:41:42 -07:00 |
|
Andrzej Kapolka
|
a2b94aa433
|
Working on render modes.
|
2014-04-04 14:22:01 -07:00 |
|
Andrzej Kapolka
|
a0c7e4d3cc
|
Working on model rendering modes.
|
2014-04-04 11:45:03 -07:00 |
|
Andrzej Kapolka
|
407a6ecc70
|
More work on voxelizing.
|
2014-04-03 11:26:54 -07:00 |
|
Andrzej Kapolka
|
005ae79928
|
Various fixes and what-not, got the basic spanner clipping working.
|
2014-03-31 18:21:28 -07:00 |
|
Andrzej Kapolka
|
176d8f746e
|
Finally at the point of actually getting spanners to turn into voxels.
|
2014-03-28 15:19:40 -07:00 |
|
Andrzej Kapolka
|
5934a7fbea
|
Working on voxelizing spanners.
|
2014-03-25 20:41:19 -07:00 |
|
Andrew Meadows
|
9079c3ecd8
|
explicit casts to remove warnings
|
2014-03-18 10:41:14 -07:00 |
|
Andrzej Kapolka
|
ae6a59ef78
|
Ray intersections for models, don't load resources if there's no network
manager installed.
|
2014-03-10 17:53:20 -07:00 |
|
Andrzej Kapolka
|
9e5aae4a39
|
Remove spanner bits.
|
2014-03-10 17:01:27 -07:00 |
|
Andrzej Kapolka
|
3b63424abd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-10 12:27:07 -07:00 |
|
Stephen Birarda
|
b705ec560f
|
cleanup resources directory references by copying beside the executable
|
2014-03-06 11:46:49 -08:00 |
|
Stephen Birarda
|
403f91c988
|
update resource references to use Qt resource system
|
2014-03-06 10:41:11 -08:00 |
|
Andrzej Kapolka
|
60b0281095
|
Ordered visitation bits.
|
2014-03-05 17:12:02 -08:00 |
|
Andrzej Kapolka
|
63b4a2453b
|
Lots of work on metavoxel LODs and spanners.
|
2014-03-04 21:27:13 -08:00 |
|
Andrzej Kapolka
|
c1a89517a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-28 18:11:46 -08:00 |
|
Andrzej Kapolka
|
29f7954d20
|
Factored out bits common to resource caches, added global limit on number of
resources being requested at any one time.
|
2014-02-27 18:13:40 -08:00 |
|
Andrzej Kapolka
|
4130d0f28b
|
Added spheres as simpler spanners for testing.
|
2014-02-26 15:01:01 -08:00 |
|
Andrzej Kapolka
|
718439014a
|
Compute the mesh extents for geometry and use them to set the spanner bounds.
|
2014-02-24 17:28:11 -08:00 |
|
Andrzej Kapolka
|
7bb3ea66ac
|
And another one.
|
2014-02-21 18:32:29 -08:00 |
|
Andrzej Kapolka
|
68fea8de1e
|
More merge fixes.
|
2014-02-21 18:32:05 -08:00 |
|
Andrzej Kapolka
|
e470b1c41d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
|
2014-02-21 18:26:40 -08:00 |
|
Andrzej Kapolka
|
b408e31d91
|
More work on spanners.
|
2014-02-20 17:18:15 -08:00 |
|
Andrzej Kapolka
|
09677b06f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
|
2014-02-20 12:05:15 -08:00 |
|
Stephen Birarda
|
ee9f8937e3
|
fix a silly typo
|
2014-02-19 18:03:34 -08:00 |
|
Andrzej Kapolka
|
494685140b
|
Various bits of work on spanners.
|
2014-02-17 21:44:32 -08:00 |
|
Andrzej Kapolka
|
9c91d3c2e7
|
Use the existing session stuff for metavoxels rather than a separate system.
|
2014-02-13 10:25:10 -08:00 |
|
Stephen Birarda
|
a1a4a3db8a
|
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
|
2014-02-07 14:27:10 -08:00 |
|
Stephen Birarda
|
05f086ae74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-07 13:48:28 -08:00 |
|
Stephen Birarda
|
a823722d27
|
add writeDatagram helper to NodeList to insert md5 hash
|
2014-02-06 14:28:58 -08:00 |
|
Andrzej Kapolka
|
ca52d67041
|
Basic script guides now working.
|
2014-02-04 15:40:17 -08:00 |
|
Andrzej Kapolka
|
e99b7ea92c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
|
2014-01-29 13:34:19 -08:00 |
|