Andrzej Kapolka
02c6b5a8bf
Fix for send delay, delay ordering.
2014-10-21 12:16:55 -07:00
Andrzej Kapolka
45fb31cd08
Basic network simulation for metavoxels.
2014-10-20 18:43:41 -07:00
Andrzej Kapolka
fba383f6d3
Render voxel cursor on heightfields, too.
2014-10-14 15:21:45 -07:00
Andrzej Kapolka
13efaba22c
Basic metavoxels example.
2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd
Basic metavoxel scripting bits.
2014-10-13 15:05:16 -07:00
Andrzej Kapolka
60da0f1567
Allow drawing cursor on dual contour surface, wired up material paint tool.
2014-10-10 17:18:52 -07:00
Andrzej Kapolka
1911cfd0be
Basic ray/voxel intersection testing up and running.
2014-10-10 15:11:37 -07:00
Andrzej Kapolka
7b0d002355
Working on ray/voxel intersection testing.
2014-10-09 19:51:02 -07:00
Andrzej Kapolka
37eff685bc
Remove the "render lower detail as points" option. It doesn't seem too
...
promising.
2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387
Provide the option to display lower detail metavoxel data as points.
2014-10-08 14:05:14 -07:00
Andrzej Kapolka
04b628bede
Added option to display Hermite data
2014-10-07 16:44:55 -07:00
Andrzej Kapolka
604fc84232
More fiddling with averages.
2014-10-07 14:33:01 -07:00
Andrzej Kapolka
c9fb73ecf8
Playing around with using points to represent distant voxel surfaces.
2014-10-06 18:52:10 -07:00
Andrzej Kapolka
9fc0abe2b3
Working on metavoxel averaging. Still pretty rough.
2014-10-06 17:30:28 -07:00
Sam Gateau
bd5c6517a5
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
Conflicts:
interface/src/ui/MetavoxelEditor.cpp
interface/src/ui/overlays/Sphere3DOverlay.cpp
2014-10-03 17:31:05 -07:00
Sam Gateau
738369e21f
Replacing glutSolidSphere by a cached Geometry
...
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)
- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius
2014-10-03 16:55:58 -07:00
Andrzej Kapolka
78825f0c4d
Fix for normalization crash.
2014-10-03 13:52:50 -07:00
Andrzej Kapolka
c67f421ea9
Generate additional vertices with different normals when normals differ by
...
"crease" angle.
2014-10-02 17:25:44 -07:00
Andrzej Kapolka
bce0147776
Added aspect fields to cuboids.
2014-10-02 12:51:56 -07:00
Andrzej Kapolka
42e95f2b38
Working on spanner metavoxel edits.
2014-10-01 18:46:23 -07:00
Andrzej Kapolka
e01113d2a7
Simplifications suggested by Andrew.
2014-09-30 12:01:44 -07:00
Andrzej Kapolka
3c1f3b77a7
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-29 19:14:47 -07:00
Andrzej Kapolka
802b14d5ab
Use Jacobi eigenvalue algorithm to get eigenvalues/eigenvectors.
2014-09-29 19:14:17 -07:00
Andrzej Kapolka
72ff908bd3
Fix for metavoxel crashes on Windows. I was expecting the scope of a
...
temporary object to last until the next line; turns out VC++ can destroy
it in the middle of evaluating the line.
2014-09-29 14:37:11 -07:00
Andrzej Kapolka
681bb60d03
Could extra comments.
2014-09-26 20:24:24 -07:00
Andrzej Kapolka
8ebb2a7fb4
Ridiculously complicated minimization code.
2014-09-26 19:32:41 -07:00
Andrzej Kapolka
3fe6e30632
Working on QR decomposition.
2014-09-26 13:43:28 -07:00
Stephen Birarda
7bae88e996
fix for calls to glm sqrt with ints
2014-09-23 08:52:22 -07:00
Andrzej Kapolka
18cb15ee7d
Warning fixes.
2014-09-22 15:31:46 -07:00
Andrzej Kapolka
07efda89ef
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
2014-09-16 13:20:43 -07:00
Andrew Meadows
0539246089
merge upstream/master into andrew/ragdoll
2014-09-15 13:56:51 -07:00
Andrzej Kapolka
9caa4d3a08
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
2014-09-15 12:19:30 -07:00
ZappoMan
d6ebbd8633
fixed use of uninitialized variable warning
2014-09-13 09:01:27 -07:00
Andrew Meadows
f2882618be
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-09-12 17:50:26 -07:00
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
