Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 14:06:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20113 commits 25 branches 0 tags 1.1 GiB
Commit graph

235 commits

Author SHA1 Message Date
Andrzej Kapolka
a504d03b14 Normal fix. 2015-01-02 17:14:17 -08:00
Andrzej Kapolka
3959f99910 Fixed voxel textures. 2015-01-02 13:57:27 -08:00
Andrzej Kapolka
e242459ea2 More render progress. 2014-12-31 17:33:43 -08:00
Andrzej Kapolka
08dfd28ec0 More rendering bits. 2014-12-31 15:53:38 -08:00
Andrzej Kapolka
83967d49cf More rendering bits. 2014-12-30 18:16:49 -08:00
Andrzej Kapolka
de4776ef08 More progress on rendering. 2014-12-30 15:36:22 -08:00
Andrzej Kapolka
fbd4ca5c08 More work on rendering. 2014-12-29 18:37:06 -08:00
Andrzej Kapolka
10fdb01436 Fix for toggling Hermite display. 2014-12-29 15:16:40 -08:00
Andrzej Kapolka
c78d38b925 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-29 14:38:17 -08:00
Andrzej Kapolka
84a2a8b83d Working on rendering. 2014-12-29 14:37:53 -08:00
Andrzej Kapolka
4153e32f57 Normal fix. 2014-12-19 18:31:49 -08:00
Andrzej Kapolka
2711b3f312 Closer to working edits. 2014-12-19 15:37:58 -08:00
Stephen Birarda
9425ea2c17 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Andrzej Kapolka
ab52f434c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-16 17:07:16 -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
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -08:00
ZappoMan
b449f650a0 more Model cleanup 2014-12-16 14:22:02 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -08:00
ZappoMan
4eef4c2438 move RenderUtils.cpp/h to libraries 2014-12-15 18:52:40 -08:00
Andrzej Kapolka
67a6134d9a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-15 15:30:27 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
Stephen Birarda
fa8b7020b0 repairs to MetavoxelSystem after reset to upstream 2014-12-15 11:49:43 -08:00
ZappoMan
3bc1321549 reduce calls to DependencyManager::get<> where possible 2014-12-15 11:40:17 -08:00
ZappoMan
7d75d2d1bf make TextureCache work with DependancyManager 2014-12-15 10:34:16 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
ZappoMan
e9ea6b20ce use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache() 2014-12-15 08:16:18 -08:00
Andrzej Kapolka
51f82b4cd9 More stack bits. 2014-12-13 17:49:55 -08:00
Andrzej Kapolka
dfcb22bd7a More progress towards stacks. 2014-12-12 15:12:03 -08:00
Andrzej Kapolka
c1c5991ac5 Fix for distorted replaced textures. 2014-12-12 12:07:48 -08:00
Andrzej Kapolka
8ccb44b71e Bits of stack implementation. 2014-12-09 16:24:07 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
d3aacc3838 Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-05 10:11:49 -08:00
ZappoMan
e68e3fe774 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:06:17 -08:00
ZappoMan
9753c82a3b get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-05 10:04:23 -08:00
ZappoMan
feab942375 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:01:16 -08:00
Andrzej Kapolka
ace415b138 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-04 16:46:32 -08:00
Andrzej Kapolka
8fb766a5d0 Only recreate the renderers for nodes that have changed. 2014-12-03 16:44:13 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrzej Kapolka
94d0612804 Fix for Hermite display. 2014-12-02 20:17:18 -08:00
ZappoMan
6d385d9a75 get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-02 11:45:33 -08:00
Andrzej Kapolka
0a329bbe3c More work on LOD rendering; now rendering in preview. 2014-11-26 16:18:57 -08:00
Andrzej Kapolka
790b085307 Rejiggering the heightfield renderer for LOD. 2014-11-26 13:02:11 -08:00
Andrzej Kapolka
296718e2aa Removed redundant members, clarified class names, used better hash factors. 2014-11-21 12:46:24 -08:00
Andrzej Kapolka
87cc565c1a I believe this should be a better hash function for the voxel coordinates. 2014-11-20 18:16:57 -08:00
Andrzej Kapolka
1e294e043b Batch voxel drawing, too. 2014-11-20 16:37:37 -08:00
Andrzej Kapolka
da85714dc8 Batch heightfield sections for better performance. 2014-11-20 15:09:38 -08:00
Andrzej Kapolka
d351a65999 Increase the smoothing cutoff. 2014-11-20 12:09:33 -08:00
Andrzej Kapolka
fa122b505a Further improvement to normals. 2014-11-19 17:38:45 -08:00
Andrzej Kapolka
82fc75b2c4 Tweak to normal computation on dual contour surfaces. 2014-11-19 17:27:10 -08:00