Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-06 18:29:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26501 commits 22 branches 28 tags 1.2 GiB
Commit graph

180 commits

Author SHA1 Message Date
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41 COmmented the review questions in code 2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013 FIxed the broken shadows 2015-04-03 17:58:21 -07:00
Sam Gateau
38d1e29a1d getting ready for pr for a few syntax issues 2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4 getting ready for pr for a few syntax issues 2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2 mirror means we render the Closkwise side 2015-04-03 10:45:30 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Seth Alves
57a4f3abe3 clear _saveNonCollisionGeometry when it's not needed, remove some debug prints 2015-04-02 06:57:27 -07:00
Seth Alves
eb78fa0f85 if switching to the mode where collision hulls are drawn, updateGeometry and simulate 2015-04-01 18:24:25 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
ZappoMan
a889191916 never cull mesh parts for avatars 2015-03-31 14:27:34 -07:00
samcake
1a18719031 and make it compile on mac... remove the field map from state just because it's unecessary 2015-03-30 21:53:59 -07:00
Sam Gateau
2a58a65a8f back to the office monday morning, State almost working in the full piupeline 2015-03-30 10:10:39 -07:00
Sam Gateau
21b5d6f404 refining the state interface and the GLBackend for it with a true cache 2015-03-28 11:26:06 -07:00
Sam Gateau
9c44100bb8 cleaning the State class code 2015-03-27 10:33:29 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
Sam Gateau
c9e0360394 using gpu::Pipeline it s mostly working but still glUniforms to get rid of 2015-03-26 13:48:49 -07:00
Sam Gateau
8938a6297f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-25 10:16:43 -07:00
Sam Gateau
c9377d0811 the model renderer now uses the map of renderPIpeline and the pipeline object of gpu, yeah. fixed the state to do the basics glState stuff correctly 2015-03-25 10:16:18 -07:00
Sam Gateau
6284159892 Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline 2015-03-24 14:58:41 -07:00
ZappoMan
168e8e8b80 more fixes to avatar parts not rendering 2015-03-24 08:31:45 -07:00
ZappoMan
3e8508f149 CR feedback 2015-03-23 11:13:35 -07:00
ZappoMan
b705d76336 total hack to ignore frustum culling in case of avatar mesh parts with no transform 2015-03-23 10:43:21 -07:00
ZappoMan
fe8ad9517f added debugging for model mesh boxes 2015-03-23 10:08:08 -07:00
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Sam Gateau
68de91c80a cleaning code for review 2015-03-20 13:17:32 -07:00
Sam Gateau
65727dd613 clean up code 2015-03-19 15:23:50 -07:00
samcake
0f22d64802 compilation on MacOSX 2015-03-18 16:28:42 -07:00
Sam Gateau
dc27bfb6ef Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-18 15:59:50 -07:00
Sam Gateau
0bd78be7f4 Transition model shaders to gpu:Shader 2015-03-18 15:57:01 -07:00
Sam Gateau
5a40fcee17 set the defines for GPU profile correctly AGAIN 2015-03-17 16:51:59 -07:00
Sam Gateau
03da3aeab4 Clean up on the GPU Profile defines in order to control features 2015-03-17 16:15:10 -07:00
Seth Alves
87cc710efc more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set 2015-03-13 18:43:24 -07:00
Seth Alves
bf1cb951a3 move PhysicsEntity so that ModelEntityItem can initiate a model download 2015-03-11 18:34:27 -07:00
Seth Alves
20a22ff42c Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-11 07:17:19 -07:00
Seth Alves
1c73f50dbc started to hook up geometry downloader to ShapeInfo 2015-03-11 07:17:13 -07:00
Seth Alves
844085b514 started on hull collisions 2015-03-10 15:30:08 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
Sam Gateau
cc85f468d6 splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu 2015-03-09 11:14:42 -07:00
Seth Alves
a180eadc91 remove stray control-Ms 2015-03-08 18:07:07 -07:00
Sam Gateau
23a6326aa1 testing the shader features in Model and refining the shader making workflow 2015-03-08 10:53:29 -07:00
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
Sam Gateau
598b791aee FIxing the compilation issue for linux 2015-03-03 11:01:47 -08:00
Sam Gateau
5ab3cbb7ec Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated 2015-02-27 17:11:16 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -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
11060ed273 trying to tackle the unenderstood transform value not going through corectly? 2015-02-18 16:00:37 -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
Sam Gateau
a6f006a36d more cleaning 2015-02-10 18:41:36 -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
0d3f9c740d duplicate cleaning code at the end of Model renderCore 2015-01-23 11:14:17 -08:00
Sam Gateau
4151833549 cleaning up for pull request 2015-01-23 10:49:04 -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
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
Sam Gateau
d759f4c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 11:54:55 -08:00
Sam Gateau
067483fce2 Adding a prototype of ambient lighting with spherical harmonics 2015-01-15 11:54:01 -08:00
Sam Gateau
9c083ce86e Using the model::Material for rendering and in shaders 2015-01-13 15:51:18 -08:00
Sam Gateau
d9efafac7e updating the model fragment shaders to use DeferredBUfferWrite 2015-01-13 14:11:38 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
ZappoMan
1bc91e7d29 removed renderTriangleProxies 2015-01-06 16:01:06 -08:00
ZappoMan
139f96c8b0 remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe 2015-01-02 14:41:09 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
Sam Gateau
6628f7b811 replace the model.frag and model.vert files from resource by the sl version of the shaders 2014-12-25 19:57:27 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
ZappoMan
89101872bb move Model and AnimationHandle to libraries 2014-12-16 14:04:39 -08:00
Renamed from interface/src/renderer/Model.cpp (Browse further)