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

220 commits

Author SHA1 Message Date
Atlante45
476e2124b7 Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Atlante45
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -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
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
c1c5991ac5 Fix for distorted replaced textures. 2014-12-12 12:07:48 -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
Andrzej Kapolka
d273e7c399 Render heightfields -> render spanners. 2014-11-18 19:49:08 -08:00
Andrzej Kapolka
a0f75c990e Working on fetching/clearing heightfield chunks. 2014-11-18 17:12:47 -08:00
Andrzej Kapolka
a3e65fc231 Simplification, window fix. 2014-11-17 18:44:38 -08:00
Andrzej Kapolka
479bea1eb2 Removed heightfield buffer code. 2014-11-14 17:18:34 -08:00
Andrzej Kapolka
bba042e823 Heightfield material paint bits. 2014-11-14 16:52:29 -08:00
Andrzej Kapolka
6dc4abd286 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 13:22:37 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
Andrzej Kapolka
b879471a4b Cursor rendering on spanners. 2014-11-13 20:55:36 -08:00
Andrzej Kapolka
b2ac33db16 Ray tests for heightfield spanners. 2014-11-13 19:53:16 -08:00
Andrzej Kapolka
75e1cf8a7b Migrate getHeightfieldHeight to spanner heightfields. 2014-11-13 18:00:25 -08:00
Andrzej Kapolka
d05bb49a74 Yet more heightfield spanner bits. 2014-11-12 15:40:54 -08:00
Andrzej Kapolka
caef237376 More work on spannerizing heightfields. 2014-11-11 14:40:05 -08:00
Andrzej Kapolka
93a61dd0c2 More heightfield bits. 2014-11-10 19:26:19 -08:00
Andrzej Kapolka
0664ff3181 Moved spanners into separate file, working on heightfields as spanners. 2014-11-10 15:51:41 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as 
well as the throbbing/scripted guides and the notion of spanner masking.
 2014-11-06 19:15:43 -08:00