Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
87332 commits 2 branches 0 tags 1.1 GiB
Commit graph

1284 commits

Author SHA1 Message Date
Sam Gateau
d5f6129082 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis 2015-03-06 10:44:15 -08:00
Sam Gateau
c097c6aad2 Adding the self introspection of shaders 2015-03-06 10:41:53 -08:00
Andrew Meadows
c3a4e5d94b fix dark lighting and missing avatars on linux 2015-03-04 16:52:27 -08:00
Sam Gateau
cad2184927 FIxing the compilation issue for linux 2015-03-03 11:09:11 -08:00
Sam Gateau
cb737d64d3 Testing the gpu::Shader compilation and building steps, ready to be used for real 2015-03-01 15:20:32 -08:00
Sam Gateau
660d9237e6 First version of the Shader and the magical shader program 2015-02-28 13:07:16 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
6b29e314c2 Adding the Stage of the Scene and exposing control of the sun light from javascript 2015-02-25 19:05:27 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
ZappoMan
5eecb6a837 correctly delete glbuffers 2015-02-25 14:44:10 -08:00
Sam Gateau
65a3e3618a Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 17:06:46 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
dev
05ae1b6fe6 fixing the mac osx code path for Transform 2015-02-20 15:20:34 -08:00
Sam Gateau
987562976a Fixing the remaining issue with the avatar rendering path 2015-02-20 14:46:36 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Sam Gateau
4e2d2bc188 Fixing the remaining issue with the avatar rendering path 2015-02-20 12:05:06 -08:00
Sam Gateau
ded78816b5 Fixing the remaining issue with the avatar rendering path 2015-02-20 11:26:08 -08:00
Sam Gateau
d08142d37d replacing glTRansform by gpu/Transform features 2015-02-19 15:12:13 -08:00
Sam Gateau
7e04f8a491 Model almost working with Transform 2015-02-19 09:52:58 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Sam Gateau
11060ed273 trying to tackle the unenderstood transform value not going through corectly? 2015-02-18 16:00:37 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Sam Gateau
d8aa0e0138 replacing the glTransform pipeline for model rendering 2015-02-17 09:44:03 -08:00
Sam Gateau
23354da828 replacing the glTransform pipeline for model rendering 2015-02-16 22:08:21 -08:00
Sam Gateau
cc3cc4f96f replacing the glTransform pipeline for model rendering 2015-02-16 09:31:29 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1 
Getting rid of glLIghts and replacing by the model::Light
 2015-02-13 10:49:53 -08:00
Stephen Birarda
54ce79db5a remove glm dependency in gpu library 2015-02-13 10:29:19 -08:00
Sam Gateau
8944bdd1e5 COmment out problems 2015-02-13 02:17:08 -08:00
Sam Gateau
e2e61c64b1 Support include path to shaders from the hifi libraries to cmake 2015-02-13 01:30:04 -08:00
Sam Gateau
798817f34a Merge branch 'master' of https://github.com/samcake/hifi into temp0 2015-02-10 23:09:12 -08:00
Sam Gateau
b9fd116dbf Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu 2015-02-10 18:38:48 -08:00
Sam Gateau
ace6dc4faf Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-08 23:23:06 -08:00
Brad Hefta-Gaub
12ab841191 Merge pull request #4248 from samcake/temp0 
Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX
 2015-02-06 16:52:40 -08:00
Sam Gateau
469ee29f0b Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-02-06 16:30:47 -08:00
Sam Gateau
bdf9164c7b debugging the new global light pass 2015-02-06 16:30:07 -08:00
Sam Gateau
d4566bb1d7 Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters 2015-02-06 15:51:57 -08:00
Sam Gateau
e9add29af1 texture memory 2015-02-06 12:17:51 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Seth Alves
a645d784d8 uint32_t rather than uint, which mac doesn't like 2015-02-04 11:26:05 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Seth Alves
450787fde2 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-02-03 17:33:27 -08:00
Sam Gateau
5719e277dd FIx the lightmap not displaying when using the texcoord0 2015-02-03 16:10:31 -08:00
Seth Alves
c1ae98fa1a quiet some compiler warnings about signed vs unsigned comparisons 2015-02-02 15:02:29 -08:00
Atlante45
0cc4f5b226 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-30 13:30:17 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Sam Gateau
b2f16be92a Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:17:55 -08:00
Stephen Birarda
d7ad20e476 fix gpu CMakeLists for Android 2015-01-29 15:01:15 -08:00
ZappoMan
6821f31f14 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	libraries/gpu/src/gpu/GLBackend.cpp
 2015-01-28 10:46:30 -08:00
Sam Gateau
4592bdcb4f fixes after review by Brad 2015-01-27 15:42:56 -08:00
Sam Gateau
80784a7a33 fixing a bug in texture storage when accessing mip #0 2015-01-22 16:57:33 -08:00
Sam Gateau
49dde269a6 experimenting with linear space vs srgb space 2015-01-22 16:27:17 -08:00
dev
03a5c398ec splitting the GLBackend.cpp in several files and fixing the build for mac 2015-01-22 12:38:24 -08:00
Sam Gateau
1e84f260a9 Removing gl calls for texture from TextureCache 2015-01-21 16:53:35 -08:00
Sam Gateau
d19bfa69f2 Even more gpu::Texture in the model rnedering 2015-01-21 10:07:10 -08:00
Sam Gateau
4302db109f First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture 2015-01-20 16:02:26 -08:00
ZappoMan
41c039f283 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-19 13:34:28 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
ZappoMan
439a1c0495 solid cube now streamizing 2015-01-15 18:46:44 -08:00
dev
d7ad5a35d6 fixes for glsl mac 2015-01-13 18:24:32 -08:00
Sam Gateau
979d50f7d8 fixed pointers which were using 0 instead of NULL and syntax in resource.h 2014-12-22 11:20:04 -08:00
Brad Hefta-Gaub
fb15b0f2a7 Merge pull request #3992 from samcake/temp0 
Add the BufferView class in gpu::Resource
 2014-12-22 10:12:48 -08:00
Stephen Birarda
2780415b1d put glew link back into gpu 2014-12-19 15:07:31 -08:00
Stephen Birarda
d7d11955f3 Revert "add a test to confirm link fail" 
This reverts commit 691be3bf7c.
 2014-12-19 15:05:13 -08:00
Stephen Birarda
691be3bf7c add a test to confirm link fail 2014-12-19 14:59:55 -08:00
Stephen Birarda
9bd0bc671b resolve conflicts on merge with upstream master 2014-12-19 14:48:18 -08:00
ZappoMan
b7165abd5b possible glew warning fix for windows 2014-12-19 14:33:45 -08:00
Sam Gateau
a7b039fbb9 Disabling glDebug 2014-12-19 13:28:19 -08:00
Sam Gateau
096b09e8e1 Importing fixes from Model branch to the gpu library 2014-12-19 12:44:46 -08:00
Stephen Birarda
504cd86fef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 09:13:06 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
ZappoMan
8091564a73 remove all glut 2014-12-18 16:12:30 -08:00
Stephen Birarda
b202eb7dae DRY up gpu library/header linking 2014-12-18 09:14:44 -08:00
ZappoMan
d3bf28e879 more Application dependency cleanup 2014-12-17 11:10:24 -08:00
ZappoMan
28f2dc62ea add windowshacks.h to GPUConfig.h and move it to shared 2014-12-15 11:49:01 -08:00
Sam Gateau
69792178b9 trying to fix the linux compilation 2014-12-05 13:43:04 -08:00
Sam Gateau
0fbdda7582 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 10:13:38 -08:00
dev
16da10bf19 compiling the gpu library on mac 2014-12-04 17:15:59 -08:00
dev
da1bb83eb0 compiling the gpu library on mac 2014-12-04 17:14:41 -08:00
Sam Gateau
1102b4d633 Moving GPU into it's own library 2014-12-04 16:40:55 -08:00