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

489 commits

Author SHA1 Message Date
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -08:00
ZappoMan
41c135c4e5 move GlowEffect to libraries 2014-12-15 19:19:21 -08:00
ZappoMan
e53833b306 make GlowEffect support DependencyManager 2014-12-15 17:29:48 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
e0a017e963 make GeometryCache work with DependancyManager 2014-12-15 10:49:34 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Brad Hefta-Gaub
7dd88eca08 Merge pull request #3829 from samcake/temp1 
refining the avatar display name rendering with different behavior if in...
 2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor 
don't slide feet during idle animations
 2014-11-19 16:38:34 -08:00
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -08:00
Andrew Meadows
6673d9d0c2 avatar stands on lowest toe 2014-11-19 09:13:24 -08:00
dev
2e19ad48a7 ready for pull request 2014-11-19 00:50:59 -08:00
dev
4028e66c08 trying to fix the lighting issue in stereo and fix the display name size and orientation 2014-11-18 18:59:54 -08:00
David Rowe
8e58e6e3b0 Remove unused methods 2014-10-31 12:48:30 -07:00
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods 
This prevents a JS script from blocking when setting C++ values.
 2014-10-29 13:01:47 -07:00
Andrew Meadows
f25cfc0c7f remove debug code 2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Philip Rosedale
d5d0fbd9d8 Hair gravity always the same 2014-10-24 16:08:01 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset() 
for improved walk animations
 2014-10-05 19:10:55 -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
9855fbcfb4 Don't bother using a callback to render the eye vectors; just rely on the 
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
 2014-09-29 11:45:12 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference 
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
 2014-09-22 10:42:25 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state 
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
 2014-09-19 15:43:22 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
stojce
a6a48aafdc Hide name for all avatars, including MyAvatar 2014-09-18 07:34:14 +02:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00
Andrzej Kapolka
ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-09-17 13:50:13 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00