Sam Gateau
11f2d74030
Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect
2015-07-09 17:33:25 -07:00
Brad Hefta-Gaub
f0a1bc15a9
Merge pull request #5286 from samcake/daft
...
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
2015-07-09 15:23:45 -07:00
Sam Gateau
8c178d03df
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 15:16:52 -07:00
samcake
1f13106f51
FIxed the issue on mac due to the abs function not correctly executing
2015-07-09 15:05:03 -07:00
Brad Davis
06563264e2
Improve batched font rendering smoothing
2015-07-09 14:34:33 -07:00
Sam Gateau
2968286779
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 11:19:45 -07:00
Sam Gateau
110b009aa4
Less magic in this world
2015-07-09 09:55:25 -07:00
Sam Gateau
8f4a108441
Dead code and disable debug info
2015-07-09 09:37:35 -07:00
Sam Gateau
fb37af3e04
Removing dead code
2015-07-09 09:25:07 -07:00
Sam Gateau
e901d5cad0
Uncommented a block left behind...
2015-07-09 09:21:53 -07:00
Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Sam Gateau
6b229d8d2d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 03:45:55 -07:00
Sam Gateau
8314fe8c7f
FInally getting a nice spot light volume working for all angles
2015-07-09 03:45:19 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Niraj Venkat
1894b42773
Added EXT support for Mac GL Query calls
2015-07-08 16:11:36 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Niraj Venkat
7e59be6196
First take oon the query for the gpu
2015-07-08 10:00:58 -07:00
samcake
5557dc4da2
clean and release the new deferredLIghtingEffect
2015-07-07 10:00:05 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
samcake
76e661f88d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-05 12:08:56 -07:00
Atlante45
0093403bba
Add depth bias option to simple programs
...
Simple programs are now lazily generated and stored in a hash
2015-07-04 18:33:03 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338
Trying to finalize the look and behavior of th estatus indicators
2015-07-02 15:06:07 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
samcake
faea97d3c7
Merge pull request #5221 from Atlante45/web
...
Fix Web entities
2015-07-02 10:45:20 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Sam Gateau
2f04a9d3da
refining the shader pipeline and trying to pass a Status Getter from the model and fails
2015-07-01 07:47:46 -07:00
Sam Gateau
20cb519c14
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
2015-06-30 08:19:00 -07:00
samcake
fefe34e558
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-27 06:48:55 -07:00
samcake
1b69b38835
fix shader issue on mac
2015-06-27 06:34:58 -07:00
Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
Atlante45
d02c69111b
Fix compile error in text shader
2015-06-26 16:56:47 -07:00
Atlante45
27a1a55275
Don't cull text background/Text is emissive
2015-06-26 16:17:41 -07:00
Atlante45
efd805bea7
Introduce new emissive simple program
...
Also fixes the shading on web entities using that program
2015-06-26 16:17:41 -07:00
Sam Gateau
51eab1bd39
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-26 15:45:47 -07:00
Sam Gateau
c41ebcae78
Covering all the case for rendering the light passes
2015-06-26 15:40:08 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Sam Gateau
2fb4ed06c0
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-23 10:18:56 +02:00
Seth Alves
20f173a474
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 19:36:09 -07:00
Brad Hefta-Gaub
a3e1987078
Merge pull request #5176 from huffman/fix-raypicking-crash
...
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Sam Gateau
9994cb7540
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-22 20:00:48 +02:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Seth Alves
f284e9d070
quiet compiler
2015-06-22 07:18:30 -07:00
Sam Gateau
f7ca1f608f
Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders
2015-06-22 14:06:14 +02:00
Ryan Huffman
1371f775ee
Add mutex lock around access to Model::_calculatedMeshPartOffset
2015-06-19 16:51:13 -07:00
Ryan Huffman
a7f291154b
Add lock around recalculateMeshPartOffsets call
2015-06-19 16:28:58 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Ryan Huffman
1734d5e584
Fix recalculateMeshBoxes being called outside of mutex
2015-06-19 15:05:55 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Ryan Huffman
35f9d49c06
Fix DrawOverlay3D::getOpaquePipeline invalid signature
2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Sam Gateau
873955b17e
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851
Merge pull request #5168 from samcake/daft
...
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
Atlante45
9c7f24eeb6
Add culled option for simple programs
2015-06-19 16:50:38 +02:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Sam Gateau
fb42613344
Fixing transparency that i just broke
2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1
Merge pull request #5145 from Atlante45/text
...
Bring back display names
2015-06-18 11:25:45 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
ZappoMan
383a2c3d63
another attempt
2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc
first cut and removing openGl dependency in shared
2015-06-18 09:30:34 -07:00
Atlante45
26e8c490c3
constexpr not handled on windows
2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7
Make array size a constexpr
2015-06-18 15:23:53 +02:00
Atlante45
30fbd37645
Transmit normal to text rendering shader
2015-06-18 15:23:52 +02:00
Atlante45
8a3a7e5b7f
Reorder triangle strip
2015-06-18 15:23:50 +02:00
Atlante45
70a020c7e3
BevelRect use triangle strips
2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032
Cleanup TextRenderer3D methods args
2015-06-18 15:23:49 +02:00
Atlante45
ca98b378df
Adjust sdf frag shader alpha correctly
2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32
Fix bevel quads
2015-06-18 15:22:48 +02:00
samcake
89fe1c47be
preping for debug the jobs
2015-06-18 13:02:06 +02:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
ZappoMan
58ee5217e3
fix some warnings
2015-06-17 14:08:02 -07:00
Brad Davis
5ded9e7eb9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 10:50:01 -07:00
ZappoMan
e9bf553254
CR feedback
2015-06-17 09:59:38 -07:00
ZappoMan
af5a910f58
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix
2015-06-17 09:36:16 -07:00
ZappoMan
8162c37013
cleanup
2015-06-17 09:33:15 -07:00
ZappoMan
0e18c75b0b
cleanup
2015-06-17 09:23:12 -07:00
ZappoMan
ea98581d22
reorganize files to cleanup headers
2015-06-17 09:18:00 -07:00
Sam Gateau
3176c8e93c
polish before PR
2015-06-17 17:09:33 +02:00
samcake
febc3333cd
Solving the rendering of textured overlay3d
2015-06-17 16:50:35 +02:00
samcake
d703748ec3
trying to solve the rendering of overlay3d
2015-06-17 16:44:02 +02:00
Sam Gateau
5c547037f2
Migrating the overaly 3d rendering in their own job and their own shader
2015-06-17 15:54:20 +02:00
samcake
cc65ad3ffb
IMproving the JOb interface
2015-06-17 15:52:11 +02:00
Brad Davis
2bf53b625e
Working on overlays and stats
2015-06-17 02:00:13 -07:00
Brad Davis
4762e1a00c
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c
Working on overlays / stats
2015-06-16 21:00:13 -07:00
Seth Alves
2ad25a2386
Merge branch 'master' of github.com:highfidelity/hifi into float-vs-double
2015-06-16 18:25:38 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
ZappoMan
6f0ae96f56
fix warning
2015-06-16 16:01:01 -07:00
ZappoMan
5abd608ccc
fix typo
2015-06-16 15:55:37 -07:00
ZappoMan
1beb95cfe7
fix FPS while still maintaining ray picking
2015-06-16 15:38:16 -07:00
Brad Davis
02d33f6086
Working on overlay rendering
2015-06-16 12:14:42 -07:00
Brad Davis
ba13b7820c
Working on overlay refactor
2015-06-16 09:58:03 -07:00
Sam Gateau
d1ac3148f0
migrating the transparent pipeline
2015-06-16 17:33:53 +02:00
Sam Gateau
e4d0090939
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-16 15:01:24 +02:00
Sam Gateau
9be87758fd
Improving the design of the Jobs and varying
2015-06-16 15:00:47 +02:00
Brad Davis
07845df4dc
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-15 16:13:51 -07:00
ZappoMan
1c3b484466
fix detailed ray picking against models
2015-06-15 12:48:51 -07:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Brad Davis
737e418878
Revert "Revert "Merge pull request #5106 from jherico/render_cursor""
...
This reverts commit 0cdc2b53fe
2015-06-13 10:02:54 -07:00
Philip Rosedale
c834937472
Merge pull request #5122 from huffman/fix-rear-view-mirror
...
Fix rear view mirror
2015-06-12 15:49:38 -07:00
Philip Rosedale
b628df45bc
Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2
...
REVERT recent changes to overlays that seem to be breaking stuff
2015-06-12 13:50:53 -07:00
Ryan Huffman
81d003bdb8
Add post-scale to view matrix when in mirror mode
2015-06-12 13:05:10 -07:00
Ryan Huffman
66a65e3675
Update model to select clockwise backface culling program when in mirror mode
2015-06-12 13:04:02 -07:00
Ryan Huffman
ad77374732
Fix setting of _renderMode
2015-06-12 13:03:33 -07:00
ZappoMan
0cdc2b53fe
Revert "Merge pull request #5106 from jherico/render_cursor"
...
This reverts commit 4d18bd7cec24fda9a733
2015-06-12 12:57:24 -07:00
ZappoMan
becd9646f2
Merge branch 'master' of https://github.com/highfidelity/hifi into cullingBugs
2015-06-12 11:43:08 -07:00
ZappoMan
7d7db65fd1
fix avatar mesh boxes not staying in sync with avatar position
2015-06-12 11:42:38 -07:00
Brad Hefta-Gaub
a5b28660ad
Merge pull request #5113 from Atlante45/debug
...
Fix text entities wrapping
2015-06-12 11:23:31 -07:00
Atlante45
30ae78e3b6
Rename getRowHeight
2015-06-12 19:50:32 +02:00
Atlante45
26dd067982
Advance with _leading on y
2015-06-12 19:44:40 +02:00
Atlante45
f3d3bd7bec
Remove _rowHeight
2015-06-12 19:44:15 +02:00
Clément Brisset
e4511e37f5
Merge pull request #5111 from ZappoMan/cullingBugs
...
hack to fix culling bugs for some subMesh parts in the windmill scene
2015-06-12 18:53:46 +02:00
ZappoMan
c17ae593f0
CR feedback
2015-06-12 09:04:16 -07:00
Atlante45
565bf8bcb2
Fix text entities wrapping
2015-06-12 15:41:37 +02:00
ZappoMan
2fc0233096
hack to fix culling bugs for some subMesh parts in the windmill scene
2015-06-11 20:50:31 -07:00
ZappoMan
feb3f68a00
hack to fix culling bugs for some subMesh parts in the windmill scene
2015-06-11 20:49:19 -07:00
Brad Davis
b7cd1ea72a
Merge remote-tracking branch 'upstream/master' into render_cursor
2015-06-11 15:04:56 -07:00
Sam Gateau
7685fe2229
Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool
2015-06-11 06:40:21 -07:00
Brad Davis
fa27550df4
Merge remote-tracking branch 'upstream/master' into render_cursor
2015-06-11 02:21:02 -07:00
ZappoMan
e06422825a
mostly getting attachments working again
2015-06-10 15:46:54 -07:00
Sam Gateau
1f62fb4b6f
Adding standard vertex and pixel shaders for drawing texture in applicationOverlay
2015-06-10 15:24:29 -07:00
ZappoMan
aa05d9f67c
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
2015-06-10 08:53:33 -07:00
Brad Davis
94c414e4e8
Add unit quad, commonly used in compositing the overlays
2015-06-10 08:12:58 -07:00
Sam Gateau
dd84bf010b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-10 00:32:22 -07:00
Sam Gateau
470e24820d
Back to clean state, just added the Material Key
2015-06-10 00:31:36 -07:00
ZappoMan
2c6ebcb06a
remove a bunch of cruft from Model
2015-06-09 12:57:14 -07:00
ZappoMan
ba0cecb356
remove attachments from Model - only supported at avatar layer
2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7
first take on the materialKey
2015-06-09 12:17:10 -07:00
Brad Hefta-Gaub
759a4a323b
Merge pull request #5087 from Atlante45/debug
...
Reduce debug on domain connection
2015-06-09 07:54:21 -07:00
Atlante45
90c9a82aeb
Remove unnecesary debug
2015-06-09 15:27:08 +02:00
Seth Alves
fb7a0e7219
back out previous change, fix error where translucent is used instead of translucentMesh
2015-06-08 22:41:59 -07:00
Seth Alves
983ae5b2f0
quiet compiler, fix some whitespace
2015-06-08 21:19:37 -07:00
Sam Gateau
87536b2f9d
Fixing the skinning issue
2015-06-08 11:22:16 -07:00
