samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d
Fix compilation issues on mac
2015-09-19 08:59:47 -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 Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
samcake
64cf8590eb
fix typos
2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf
fix typos
2015-09-18 11:51:28 -07:00
samcake
767407af9c
Merging and cleaning shaders
2015-09-18 11:46:44 -07:00
samcake
d4fd2ea4c6
merging
2015-09-18 11:31:53 -07:00
Sam Gateau
d0f7ddd3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-18 00:03:19 -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
882ca5d6c0
Fix the lights not rendering roperly
2015-09-16 15:57:35 -07:00
Sam Gateau
d45547aa1a
Merge and update
2015-09-16 13:46:07 -07:00
BOB LONG
efc321bc10
Display face blend coefficients
...
Display the face blend coefficients and update the value in real time.
2015-09-16 00:40:26 -07:00
Brad Davis
f35ffd2ab7
Merge pull request #5814 from samcake/HMDLightingBug
...
Fixing HMD and stereo lighting bug
2015-09-15 18:10:26 -07:00
Sam Gateau
08546fcc08
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-15 18:07:26 -07:00
Sam Gateau
80d25a68b6
Bringing back the eyeView per side to the deferred transform stack
2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945
FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix
2015-09-15 17:48:55 -07:00
Sam Gateau
f00e3829f1
Cleaning for PR
2015-09-15 16:54:04 -07:00
Sam Gateau
7b8e11e01c
Debugging, looking good, no ready for final lighting
2015-09-15 15:22:45 -07:00
Sam Gateau
dc8756e465
Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation
2015-09-15 14:40:23 -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
f4818c17cf
Fix avatar and other model animations
2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3
Don't do an O(N^2) operation on cluster matrices
2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
70fcdbf2fd
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:20:11 -07:00
Sam Gateau
45dc5be53d
DeferredTransform buffer working for the deferred rendering in mono
2015-09-14 17:48:15 -07:00
Brad Davis
35e4440c4f
Don't do an O(N^2) operation on cluster matrices
2015-09-14 16:09:13 -07:00
Sam Gateau
00688172dd
work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes
2015-09-14 15:49:05 -07:00
Sam Gateau
3690d5a4c2
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-14 12:28:59 -07:00
Sam Gateau
6c63dc0444
work in progress
2015-09-14 12:28:33 -07:00
Brad Davis
1bb15e28d6
Fixing differing highlights between left and right eyes in stereo modes
2015-09-14 11:24:28 -07:00
Sam Gateau
0fcfacdd72
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-14 10:18:42 -07:00
Sam Gateau
3f2609e52a
merging
2015-09-14 09:59:04 -07:00
Sam Gateau
9074d0d6e1
very first version of the TextureStorage working
2015-09-14 09:29:46 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Sam Gateau
cf1f5b8771
Work in progress
2015-09-11 15:25:33 -07:00
Sam Gateau
5cc5609e87
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-11 12:05:02 -07:00
Anthony J. Thibault
7996a02bd8
Added head target to AnimGraph IK node.
...
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
default to the underlying pose position.
2015-09-11 09:48:48 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
73a5714d66
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-09 10:37:11 -07:00
Seth Alves
e06461ea15
Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements
...
AnimDebugDraw Improvements
2015-09-08 17:07:51 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Howard Stearns
26f63a44fc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 15:30:22 -07:00
Stephen Birarda
a3959109f1
resolve conflicts on merge with upstream/master
2015-09-08 15:18:39 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Howard Stearns
27f4bca0a4
Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread!
...
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
2015-09-08 14:49:58 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
Anthony J. Thibault
6d5927c0c9
Now with less copies.
...
* AnimSkeleton now returns AnimPoses by const ref.
* AnimDebugDraw: uses references to Poses on the stack instead of copies
within inner loops.
* AnimDebugDraw: Removed unnecessary universal refs in range based for loops.
2015-09-08 10:51:23 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Howard Stearns
efeaf21305
Checkpoint smoother.
2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31
Snapshot of no-judder, before cleanup.
2015-09-07 09:57:05 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
Anthony J. Thibault
69e463bbfd
AnimDebugDraw Improvements
...
* Now always works, regardless of whether or not Rig or AnimGraph animations
are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
2015-09-04 16:01:05 -07:00
Howard Stearns
d3106de7c1
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-04 14:32:58 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
3f258c89b4
Fix transition from AG+Rig to AG only.
2015-09-04 11:03:59 -07:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db
Merge pull request #5684 from rabedik/fxaa
...
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Raffi Bedikian
6b2897ca8f
Fix AA bugs with display plugins and mini-mirror
2015-09-03 23:11:53 -07:00
Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
Anthony J. Thibault
30264e9c3d
Added animation debug draw items to menu.
...
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
2015-09-02 21:04:29 -07:00
Raffi Bedikian
2d95d1c236
Fix various whitespace issues
2015-09-02 13:49:21 -07:00
Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Raffi Bedikian
9318661bc3
Add algorithm comments to FXAA shader
2015-09-01 23:54:48 -07:00
Howard Stearns
8cf71f285d
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-01 16:03:40 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Andrew Meadows
fe2d03fd37
merge
...
Conflicts:
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
libraries/shared/src/GLMHelpers.cpp
2015-09-01 11:17:08 -07:00
Anthony J. Thibault
2401e6cc4b
Merge branch 'master' into ajt/new-anim-system
2015-09-01 10:58:38 -07:00
Seth Alves
7b6d267c06
Merge pull request #5675 from AndrewMeadows/darmstadtium
...
remove PhysicsEntity class
2015-09-01 10:06:01 -07:00
Stephen Birarda
fa0abe2972
resolve conflicts on merge with upstream/master
2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Raffi Bedikian
ff2a58b3eb
Add FXAA effect class, modeled after AO effect
2015-08-30 20:49:03 -07:00
Raffi Bedikian
1001cf9000
Add shader files for FXAA
2015-08-30 20:48:06 -07:00
Sam Gateau
4e944645fe
more cleaning for showing a cleaner pr
2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9
Cleanup
2015-08-28 16:38:07 -07:00
Sam Gateau
e2fce12713
Splitting the FBXREader.cpp file into sub files
2015-08-28 09:51:03 -07:00
Sam Gateau
8ea8eea08d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-08-28 08:13:10 -07:00
Sam Gateau
85f230bf17
Getting rid of the NetworkMEshPart and simplifying the thinking around the MOdel regarding its RenderItems
2015-08-28 08:12:50 -07:00
Andrew Meadows
614fad0811
remove warnings from linux build
2015-08-27 19:12:25 -07:00
Stephen Birarda
8ea20b5e5e
fix warning on string literal call to qFatal
2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892
remove PhysicsEntity class
2015-08-27 18:22:12 -07:00
Stephen Birarda
8ee27bca2b
remove urlAsString from Model
2015-08-27 16:00:21 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Ryan Huffman
755c33e551
Remove unused variable
2015-08-27 14:11:40 -07:00
Ryan Huffman
24eef654e0
Remove unnecessary debug
2015-08-27 14:11:29 -07:00
Ryan Huffman
750080fe66
Remove early return in Model::restoreJointPosition
2015-08-27 12:52:01 -07:00
Anthony J. Thibault
778521f664
Improvement to bone link rendering when bones are large.
2015-08-27 10:21:23 -07:00
Sam Gateau
4f7b857130
Merge
2015-08-27 10:01:39 -07:00
Sam Gateau
f6953f8e02
REfining th eTextureMap design but still with the issue of the lightmapped model
2015-08-27 09:52:07 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Howard Stearns
8e3d8cd31c
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-26 16:08:42 -07:00
Howard Stearns
475331a97d
Sprinkle locks everywhere.
2015-08-26 16:08:07 -07:00
Ryan Huffman
269d5bb6da
Resolve bugs with *Cache changes
2015-08-26 14:04:55 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -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
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Sam Gateau
84d0be134e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-08-25 22:13:22 -07:00
Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
