Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 11:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27447 commits 76 branches 59 tags 1.2 GiB
Commit graph

234 commits

Author SHA1 Message Date
Atlante45
5d19431d26 Copy/paste error with useClientState 2015-05-26 20:20:39 +02:00
Atlante45
76fc59675b Merge branch 'team-teaching' into text-renderer 2015-05-26 20:01:26 +02:00
Atlante45
526ec3d489 Move #if #else #endif for convenience 
This is a convenience change. The double '{' created by the #else messes
up Xcode autoindentation.
It won't that way and the fact that useClientState is a const set to
false when SUPPORT_LEGACY_OPENGL, the code inside the if should still
get optimised out by the compiler.
 2015-05-25 11:45:16 +02:00
Ryan Huffman
bffcfa2ab8 Add cache sync flag in Context::enqueueBatch 2015-05-22 15:34:05 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Atlante45
e691a03c97 Remove push/popInputState 2015-05-22 20:30:54 +02:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Atlante45
6b9f9a32bb Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program 2015-05-21 20:58:42 +02:00
Sam Gateau
3ec6ada29d Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state 2015-05-19 00:32:36 -07:00
Atlante45
16e6f76028 Improve init/killInput 
Added glPush/PopClientAttrib() calls
Overrites _input._attributeActivation with the correct values
 2015-05-18 15:47:57 +02:00
Atlante45
ede94e4248 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform 2015-05-18 11:39:17 +02:00
Atlante45
4bbc5de39d Remove "raw" gl calls 
Removed calls to batch._gl*
Added init/killInput in glBackend ctor/dtor
	This will disable client states and set buffers to 0
 2015-05-17 11:58:39 +02:00
Sam Cake
765145b898 Moving the load of the texture and the generation of the cube map irradiance in the same thread 2015-05-15 11:28:59 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
Sam Cake
65e83df214 Generating the SH from the cube map! 2015-05-13 11:08:18 -07:00
Sam Cake
536fff4502 Trying to create the SH from the skybox cubemap 2015-05-12 23:11:52 -07:00
Sam Gateau
45e70c98f8 Fixed the cube map loading issue 2015-05-11 13:43:15 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Sam Gateau
72c3270ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-11 10:48:29 -07:00
Sam Gateau
f1fcce3ea0 refactoring th ecube texure loading to support 2 different layouts 2015-05-11 10:47:45 -07:00
Seth Alves
68e01d2bd9 quiet compiler 2015-05-10 17:03:42 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
Sam Gateau
ce5295a55f THese is not final but we have a basic working framework so let's try to share 2015-05-07 17:06:15 -07:00
Sam Gateau
54c47fe3f9 merging 2015-05-07 11:35:58 -07:00
Sam Gateau
653d2e72b1 Skybox kind of working 2015-05-07 11:23:11 -07:00
Atlante45
cafaeed822 Restore polygon mode after entities rendering 
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
 2015-05-07 13:34:22 +02:00
Atlante45
366964e424 Fix static initialisation fiasco 2015-05-07 13:00:56 +02:00
Atlante45
721eeccce2 Restaure GL to default after we render a batch 2015-05-07 12:01:22 +02:00
Sam Gateau
00c45dbb43 missing includes 2015-05-06 12:38:12 -07:00
samcake
06e1330e42 Clean up the includes in gpu, make the skybox shader works 2015-05-06 12:12:54 -07:00
samcake
50012ee9de fixing build issues on MAc 2015-05-06 11:00:37 -07:00
Sam Gateau
fe3b5d1867 preparing for PR, back to the default background mode SKy_DOME 2015-05-06 10:27:31 -07:00
Sam Gateau
dc81a3ecc2 Cube texture are working with the GL backend, useing it in SKybox successfullly 2015-05-06 09:53:36 -07:00
Sam Gateau
ade404a74d getting rid of QSHaredPointer in favor of std::shared_ptr 2015-05-04 13:43:30 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
samcake
c8e5b35de9 Fixing typo 2015-05-01 12:04:15 -07:00
samcake
6da796f735 fix the bug with sahdows on Mac due to the fbo needing a colorbuffer even though it's not needed 2015-04-30 23:31:56 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Sam Gateau
8b97d2585a fixing syntax issues 2015-04-15 10:16:04 -07:00
Sam Gateau
598abe6722 Cleaning up Frambuffer.h 2015-04-14 18:48:06 -07:00
Sam Gateau
fec52f6b10 Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly 2015-04-14 18:27:24 -07:00
Sam Gateau
87030236cb working version with the gpu::SAmpler and the gpu::Framebuffer 2015-04-14 15:53:24 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
Sam Gateau
51ce3129b9 connecting the dots for a framebuffer GLBackend, need to be tested 2015-04-13 12:22:08 -07:00
Sam Gateau
05689c0413 Bringin the Framebuffer to GLBackend and refining the interface 2015-04-13 11:13:30 -07:00
Sam Gateau
69484ad00b Creating the Framebuffer class and the companion Swapbuffer 2015-04-12 17:36:45 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
David Rowe
ae3d606e95 Replace try with nothrow 2015-04-09 10:01:31 -07:00
David Rowe
b2dd53ac43 Coding standard 2015-04-09 08:37:24 -07:00
David Rowe
e768852645 Fix catching bad_alloc 
Non-allocation wasn't caught on Windows; it just crashed.
 2015-04-08 20:02:22 -07:00
Seth Alves
2448051c75 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-08 15:39:40 -07:00
Seth Alves
5c709e2638 quiet compiler 2015-04-08 15:39:07 -07:00
samcake
4fb5c8f907 fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from. 2015-04-08 11:04:13 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Seth Alves
8bd77fbcc7 separate out logging for fbx and gpu libraries 2015-04-06 16:52:31 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -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
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
Sam Gateau
d4dac0477b changed again the state field storage for hopefully the better by using the Cache class and compressing it 2015-03-31 09:47:56 -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
ee4b9a483b found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 18:04:44 -07:00
Sam Gateau
ee3ec3fe1a found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 17:28:58 -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
ce659e6307 Introducing the gl state capture in order to resync the gpu::state with the true gl state 2015-03-29 10:15:18 -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
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
1746c1de46 t :wq 
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
 2015-03-25 16:27:32 -07:00
Sam Gateau
045dbb11a3 Putting the GLERRORCHECK only in debug 2015-03-25 11:07:19 -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
Sam Gateau
19a96c4815 Adding the State to gpu and wiring the pipeline in glBackend to potentially make it work soon :) 2015-03-23 22:33:25 -07:00
Sam Gateau
69667fb5ca making the state work 2015-03-23 10:21:35 -07:00
Sam Gateau
07bcd115c2 trying to remove useless glsl code for Legacy path 2015-03-20 13:28:42 -07:00
Sam Gateau
5063159581 cleaning code for review 2015-03-20 12:00:16 -07:00
Sam Gateau
fdbf4e5288 cleaning code for review 2015-03-20 11:55:00 -07:00
samcake
d2868bcafc fixing the shader for mac 2015-03-19 16:00:47 -07:00
Sam Gateau
619a323196 Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack 2015-03-19 14:46:50 -07:00
Sam Gateau
b33ba64e05 trying to tweek the transform equation to find the intel bug 2015-03-18 17:20:27 -07:00
samcake
0f22d64802 compilation on MacOSX 2015-03-18 16:28:42 -07:00
Sam Gateau
414315b6e0 Since glProgramUniform is not supported on MAc we need a workaround... 2015-03-18 16:15:06 -07:00
Sam Gateau
b5eb4a7f5b Since glProgramUniform is not supported on MAc we need a workaround... 2015-03-18 16:12:47 -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
74ae0c4a85 set the defines for GPU profile correctly 2015-03-17 16:35:32 -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
Brad Davis
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Seth Alves
af10c2274b remove stray carriage returns 2015-03-15 08:24:49 -07:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00
samcake
ee5409b0a8 fixing compilation on macosx 2015-03-09 14:25:59 -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
Sam Gateau
23a6326aa1 testing the shader features in Model and refining the shader making workflow 2015-03-08 10:53:29 -07:00