Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 13:27:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17432 commits 25 branches 0 tags 1.1 GiB
Commit graph

144 commits

Author SHA1 Message Date
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
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