Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:53:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
38535 commits 75 branches 59 tags 1.2 GiB
Commit graph

532 commits

Author SHA1 Message Date
samcake
1adf2cc8ba Repesenting the collision meshes of a Model correctly 2015-12-08 16:45:12 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Brad Hefta-Gaub
49a7852d76 Merge pull request #6540 from Atlante45/warnings 
Fix warnings on OS X
 2015-12-04 10:19:25 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Brad Davis
3854523787 Fixing 32 bit build breakage 2015-12-03 09:17:41 -08:00
Brad Davis
7a05a664f4 Updating GPU for 64 bit 2015-12-02 21:34:11 -08:00
Atlante45
d08a4d77dc Shader cleanup 2015-11-24 11:51:56 -08:00
Atlante45
28c8cf26f5 Fix shader transform errors 2015-11-24 11:51:56 -08:00
Atlante45
cb14fbf4a1 Instance particle draw calls 2015-11-24 11:51:56 -08:00
Atlante45
230a413ec1 First pass at new particle shader 2015-11-24 11:51:56 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Brad Davis
764ecba2a8 Adding diagnostics to track down the 'black rectangles of death' 2015-11-02 21:55:35 -08:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Andrew Meadows
7fa069cf30 fix line endings grumble gruble 2015-10-20 09:38:25 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Atlante45
cba8b0962d Fix warnings 2015-10-09 13:29:59 -07:00
samcake
bad5ea7d53 grouping the depth and stencil buffer into a single buffer 2015-10-08 16:47:33 -07:00
samcake
dff598ebd1 clening and getting ready for pr 2015-10-08 12:06:09 -07:00
samcake
a2ca1c033d FIxing the rear view mirror issue with background and fooling around with Lighting equations 2015-10-07 19:04:03 -07:00
samcake
0a351a8a0c FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture 2015-10-07 14:26:33 -07:00
samcake
05da9d94cd fixing the depth stencil texture case 2015-10-07 11:20:11 -07:00
samcake
894c8c0a93 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-05 19:23:30 -07:00
samcake
12fedb6ff0 Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer 2015-10-05 18:31:05 -07:00
samcake
48416262a1 Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced 2015-10-04 18:31:19 -07:00
Brad Davis
c8aea67505 Working on texture compatibility with Shadertoy 2015-10-02 19:09:43 -07:00
samcake
edaa8f998a Migrating to the new mesh for rendering and having problems with multi part mesh 2015-10-02 18:12:16 -07:00
samcake
a22ee03732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-02 12:25:09 -07:00
samcake
edb485cb0f working on getting the Model payload to use model::Mesh 2015-10-02 12:24:41 -07:00
Brad Davis
de5e95f7dc Improved procedural surfaces, textures and more standard uniforms 2015-10-02 11:57:13 -07:00
samcake
690620d74d Cleaning code 2015-10-01 19:23:32 -07:00
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
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
Brad Hefta-Gaub
dccf121cd3 Merge pull request #5928 from jherico/homer 
Disabling vertex attrib format due to crashes
 2015-09-29 10:01:36 -07:00
Brad Davis
daf803e8ea Disabling vertex attrib format due to crashes 2015-09-29 09:52:41 -07:00
samcake
8a8411c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-29 09:15:53 -07:00
samcake
833c31a6a6 Merge pull request #5923 from jherico/lisa 
Fix broken textures in stereo/HMD
 2015-09-28 18:21:08 -07:00
Brad Hefta-Gaub
670df7e443 fix coding standard issue and comment 2015-09-28 17:36:42 -07:00
Brad Davis
375d783997 Better fix for texture issues in stereo 2015-09-28 17:13:51 -07:00
Brad Davis
88d48994ed Disabling glVertexAttribFormat for now because of an issue with instancing 2015-09-28 16:17:56 -07:00
Brad Hefta-Gaub
32b56a4bf7 fix the slight flicker that's being caused by error in calculating the model inverse matrix 2015-09-28 16:09:57 -07:00
samcake
728a4cb112 Adding the comment to the glActiveBindTexture call 2015-09-28 12:45:39 -07:00
samcake
95ea874d43 Minor fixes to the way the specular color is interpreted 2015-09-28 12:43:15 -07:00
Brad Davis
203c601e95 Fix for bad textures when using _glActiveBindTexture 2015-09-28 12:26:11 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
432dc2055f gak 2015-09-23 17:38:59 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
Brad Hefta-Gaub
62c1e40127 CR repairs 2015-09-23 17:15:29 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
samcake
9c44c3e4a4 Removing warnings 2015-09-23 16:19:34 -07:00
samcake
5176d51714 Merge and fix warnings 2015-09-23 16:05:53 -07:00
Brad Hefta-Gaub
24e2215f14 fix mac/unix build 2015-09-23 15:47:52 -07:00
samcake
5fd2992c28 sometimes, magic happens, and clean rebuilds... 2015-09-23 15:34:49 -07:00
samcake
83116fdd85 Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced 2015-09-23 15:20:39 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
samcake
acfb5a32bc Rename the nb parameters with num 2015-09-23 12:28:46 -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
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Brad Davis
deaa4a747b Batch side implementation of multi-draw indirect 2015-09-22 15:56:58 -07:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -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
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -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 Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart 
Instanced rendering for Box entities
 2015-09-18 18:06:25 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Bradley Austin Davis
f851c6204f Remove overcalling of glVertexAttrib4f 2015-09-18 15:14:04 -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
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
1bb15e28d6 Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Brad Davis
743d79335d Procedural shaders V2 2015-09-07 17:37:45 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Andrew Meadows
45c846572e Merge pull request #5645 from jherico/maggie 
Fixing problems reported by static analysis tool
 2015-08-26 08:31:05 -07:00
samcake
fda9827100 Merge pull request #5529 from SeijiEmery/gputest 
gputest
 2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Seiji Emery
6b5fb60fcf Merge remote-tracking branch 'highfidelity/master' into gputest 2015-08-19 11:24:15 -07:00
Andrew Meadows
9ee49c3e1e Merge pull request #5551 from sethalves/quiet-compiler 
Quiet compiler
 2015-08-18 09:54:29 -07:00
Anthony J. Thibault
cd58f012a3 Fix for ATI discrete graphics on 2015 macbook pro / mac pro. 
Fixed incorrect size for camera transform uniforms passed via
glBindBufferRange.   This is a legitimate bug on our side.
I guess Intel and nVidia drivers just happen to ignore this field.
This was likely causing many of the shader TransformCamera members
to be identity or un-initialized, specifically, the projection
matrix values.

This was resulting in a black screen on ATI gpus.
 2015-08-15 09:42:05 -07:00
Brad Davis
f539e95e53 Fixing includes 2015-08-11 12:02:40 -07:00
Bradley Austin Davis
e94cff594d Working on breaking up transfers and draws 2015-08-11 12:02:39 -07:00
Seth Alves
fedbfe8881 fix jumbled merge 2015-08-11 11:00:04 -07:00
Seth Alves
804c1ecf8e quiet compiler 2015-08-11 10:46:53 -07:00
Seth Alves
dab5848330 quiet compiler 2015-08-11 10:21:30 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00
Seiji Emery
5ca8d20251 Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 
Conflicts:
	cmake/modules/Find3DConnexionClient.cmake
	interface/external/connexionclient/readme.txt
	interface/src/devices/3DConnexionClient.cpp
	interface/src/devices/3DConnexionClient.h
 2015-08-05 15:56:06 -07:00
Stephen Birarda
998a8168a3 remove an extra unneeded message 2015-08-05 14:38:14 -07:00
Stephen Birarda
653e0d29c7 resolve conflicts on merge with upstream/core 2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Bradley Austin Davis
89cc2ccfa5 More merge comments 2015-08-05 13:53:19 -07:00