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

360 commits

Author SHA1 Message Date
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Sam Gateau
89f9e5b01b try to get more coherent names 2014-10-27 11:49:51 -07:00
Sam Gateau
ff44a460d6 Add NSIGHT Profiliing capability 2014-10-27 11:40:52 -07:00
Sam Gateau
d92c03364a Improve comment regarding the replacement of the QGLProgram->bind() 2014-10-23 14:53:43 -07:00
Sam Gateau
d13283192f Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code 2014-10-22 14:07:15 -07:00
Sam Gateau
821284edfd Introduce the gpu::Batch for the full Model::render call 2014-10-21 17:46:41 -07:00
Sam Gateau
00dbe486d9 FIrst working version of the GLBatching system introduced in the MOdelrendering path 2014-10-21 10:50:53 -07:00
Sam Gateau
0def490db7 startign to record all the gl commands in the Batch 2014-10-17 18:17:44 -07:00
ZappoMan
47f5d499f6 small optimization 2014-10-16 15:26:01 -07:00
ZappoMan
148b880bb1 handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes 2014-10-16 14:32:07 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
ZappoMan
ffb7bcf9d3 wire up different culling options to debug menus 2014-10-16 09:32:24 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
ZappoMan
4c7ecba579 spelling change 2014-10-15 20:23:04 -07:00
ZappoMan
921a3fb8c0 switch QList<> to QVector<> and add some guards against out of range indices 2014-10-15 20:18:04 -07:00
ZappoMan
56b4d58f18 implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group 2014-10-15 17:08:47 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
Andrzej Kapolka
4c617c6d55 Stop using the emissive color for glow. 2014-09-29 14:51:45 -07:00
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -07:00
Andrzej Kapolka
6c907a9d83 Read the emissive color property and use it to effect glow. 2014-09-19 16:49:51 -07:00
Andrzej Kapolka
9515145b9b Removed commented lines. 2014-09-19 15:48:56 -07:00
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -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
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00
Andrzej Kapolka
5c22fe7bd1 Translucency tweak. 2014-09-18 13:27:15 -07:00
Andrzej Kapolka
fb7e633cac Post-merge fixes. 2014-09-18 13:17:23 -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
Andrzej Kapolka
e0a56b4a95 Rejiggered the blender handling: allow up to N blenders active at once so 
that with small numbers of avatars, the blenders can stack for lower latency.
 2014-09-17 17:57:08 -07:00
Atlante45
3751e05ce3 Fixes crash in Model::scaleToFit() 2014-09-17 13:37:16 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
Andrzej Kapolka
bfaac9eae1 Deferred lighting tweaks. 2014-09-15 18:38:10 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Andrzej Kapolka
9caa4d3a08 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-15 12:19:30 -07:00
Andrzej Kapolka
919112fe7c Starting to work on handling translucent meshes with deferred lighting. 2014-09-15 12:18:59 -07:00
ZappoMan
c32d5db75c fix bug with attachments being stretched 2014-09-13 15:32:21 -07:00
Andrzej Kapolka
72f38900bb Fix for blending on models. 2014-09-12 17:31:03 -07:00
Andrzej Kapolka
982ab75b61 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 17:09:25 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrzej Kapolka
97813a2f72 Make sure we note that the blender finished even if the geometry changed. 2014-09-12 15:34:49 -07:00
Andrzej Kapolka
72a6254fa1 Only allow one "blender" to run at a time for each model. 2014-09-12 15:24:38 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrzej Kapolka
e29a4e7683 Merge pull request #3312 from AndrewMeadows/ragdoll 
use dispatchTable for shape-vs-shape collision queries
 2014-08-25 15:43:48 -07:00
Andrew Meadows
6cdee21a50 fix for clearJointData() in JS scripts 
let the JointState class verify animation priority
 2014-08-25 10:40:28 -07:00
Andrew Meadows
bc1276944c merge upstream/master into andrew/ragdoll 2014-08-21 08:21:36 -07:00
Andrew Meadows
080c191727 namechange updateConstraint() -> buildConstraint() 2014-08-21 08:20:31 -07:00
Andrew Meadows
7e4c72445e JS scripts set joint animation priorities 2014-08-20 17:14:59 -07:00