Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 17:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33636 commits 71 branches 56 tags 1.2 GiB
Commit graph

1399 commits

Author SHA1 Message Date
samcake
3490e08521 Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances 2015-10-01 18:42:09 -07:00
Anthony J. Thibault
fa864d29f9 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
Andrew Meadows
09ac01a5e7 remove cruft from old verlet avatar simulation 2015-10-01 13:44:50 -07:00
samcake
0398f9429e fix the coo/texel blender mode for the case when color is black and the stereo issue 2015-09-30 18:39:13 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Sam Gateau
e78f1521ab getting the stencil buffer in place 2015-09-30 09:24:36 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub
04115052b3 Merge pull request #5938 from samcake/calvin 
Fixing the lighting view matrix for stereo again
 2015-09-29 15:08:41 -07:00
samcake
1bd07b58c3 Fixing the lighting view matrix for stereo again 2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
samcake
840f92bd06 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c merging 2015-09-29 10:53:56 -07:00
samcake
202d2944ab Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-28 17:24:59 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
samcake
95ea874d43 Minor fixes to the way the specular color is interpreted 2015-09-28 12:43:15 -07:00
Brad Hefta-Gaub
ce3da099f6 normalize the surface normal from the triangle, coding standard fix, update example 2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
5e82b9c433 more warning fixes 2015-09-24 08:26:56 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
5a80c4d0e7 Merge pull request #5886 from samcake/calvin 
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
 2015-09-23 19:13:28 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
samcake
8bdfc853d9 Merge branch 'orange' of https://github.com/samcake/hifi into hobbes 2015-09-23 17:31:04 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
samcake
8735aa8003 Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux 2015-09-23 12:19:17 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a9848cd157 Merge branch 'master' into tony/lean-threshold 2015-09-23 10:54:12 -07:00
samcake
7f8450f77b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-23 10:30:51 -07:00
samcake
d7d332acd4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 
t :wq
 2015-09-23 09:51:31 -07:00
Brad Hefta-Gaub
387c4fbd92 fix bad oglplus pragma warnings 2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub
17a3fd159a apparently unix doesn't like the generic type version of sqrt() 2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
02e1de3ba3 more warnings fixes 2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
cd9aad4f41 more warnings fixes 2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
9436d2922f more warnings fixes 2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
5b00783f18 more warnings fixes 2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
8d8035a418 Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning 
Conflicts:
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/Model.h
 2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
52842cb287 more warnings fixes 2015-09-22 20:34:40 -07:00
Anthony J. Thibault
d04f4d4b2b Added shared DebugDraw singleton. 2015-09-22 19:57:23 -07:00
samcake
518f5fe17c Starting to clean the mesh part of the RenderItem.... 2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
6f7e13b3c1 more warning fixes 2015-09-22 17:26:45 -07:00
Andrew Meadows
2edffaf91a remove unused variables 2015-09-22 17:20:13 -07:00
Andrew Meadows
11fee94459 remove warning about signed/unsigned comparison 2015-09-22 17:19:47 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
Brad Davis
deaa4a747b Batch side implementation of multi-draw indirect 2015-09-22 15:56:58 -07:00
Brad Hefta-Gaub
5bcce50b98 Merge pull request #5846 from bob-long/master 
Display the face blend coefficients and update the value in real time.
 2015-09-22 14:56:56 -07:00
samcake
80e5581639 fixing review comments 2015-09-21 22:51:14 -07:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
BOB LONG
a23a90bf5f Code simplification 
Simplify the code a bit as suggested:

1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation

Correct the js sample file header.

testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
 2015-09-21 19:11:13 -07:00
samcake
91b9940fe9 Merging and a fix for the diffuse map floating around 2015-09-21 18:09:25 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
samcake
21f53f1bbd debugging the lighting issue on the craps table 2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
Bradley Austin Davis
0401672c82 Fixing lighting again 2015-09-21 16:24:55 -07:00
Bradley Austin Davis
b3aeaba5f4 CR feedback 2015-09-21 15:44:47 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
samcake
6a714f405c Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map 2015-09-21 00:53:48 -07:00
samcake
3614812681 MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce 2015-09-20 23:31:59 -07:00
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d Fix compilation issues on mac 2015-09-19 08:59:47 -07:00
samcake
8941741508 Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap 2015-09-18 18:47:18 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
samcake
64cf8590eb fix typos 2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf fix typos 2015-09-18 11:51:28 -07:00
samcake
767407af9c Merging and cleaning shaders 2015-09-18 11:46:44 -07:00
samcake
d4fd2ea4c6 merging 2015-09-18 11:31:53 -07:00
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
Sam Gateau
b207d97f72 Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
Sam Gateau
882ca5d6c0 Fix the lights not rendering roperly 2015-09-16 15:57:35 -07:00
Sam Gateau
d45547aa1a Merge and update 2015-09-16 13:46:07 -07:00
BOB LONG
efc321bc10 Display face blend coefficients 
Display the face blend coefficients and update the value in real time.
 2015-09-16 00:40:26 -07:00
Brad Davis
f35ffd2ab7 Merge pull request #5814 from samcake/HMDLightingBug 
Fixing HMD and stereo lighting bug
 2015-09-15 18:10:26 -07:00
Sam Gateau
08546fcc08 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-15 18:07:26 -07:00
Sam Gateau
80d25a68b6 Bringing back the eyeView per side to the deferred transform stack 2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945 FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix 2015-09-15 17:48:55 -07:00
Sam Gateau
f00e3829f1 Cleaning for PR 2015-09-15 16:54:04 -07:00
Sam Gateau
7b8e11e01c Debugging, looking good, no ready for final lighting 2015-09-15 15:22:45 -07:00
Sam Gateau
dc8756e465 Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation 2015-09-15 14:40:23 -07:00
Sam Gateau
400f90aea4 Introducing a stereo loop that should do the right thing but doesn't yet 2015-09-15 08:34:46 -07:00
Brad Davis
f4818c17cf Fix avatar and other model animations 2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3 Don't do an O(N^2) operation on cluster matrices 2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
70fcdbf2fd Revert "Fix over-calculation of cluster matrices" 2015-09-14 21:20:11 -07:00
Sam Gateau
45dc5be53d DeferredTransform buffer working for the deferred rendering in mono 2015-09-14 17:48:15 -07:00
Brad Davis
35e4440c4f Don't do an O(N^2) operation on cluster matrices 2015-09-14 16:09:13 -07:00
Sam Gateau
00688172dd work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes 2015-09-14 15:49:05 -07:00
Sam Gateau
3690d5a4c2 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-14 12:28:59 -07:00
Sam Gateau
6c63dc0444 work in progress 2015-09-14 12:28:33 -07:00
Brad Davis
1bb15e28d6 Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
Sam Gateau
0fcfacdd72 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-14 10:18:42 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Sam Gateau
9074d0d6e1 very first version of the TextureStorage working 2015-09-14 09:29:46 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Sam Gateau
cf1f5b8771 Work in progress 2015-09-11 15:25:33 -07:00
Sam Gateau
5cc5609e87 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 12:05:02 -07:00