Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Brad Davis
70de00c6bf
Merge pull request #9421 from jherico/more_trace_details
...
Additional trace details for GPU timing, frame data updates
2017-01-19 09:12:34 -08:00
Dante Ruiz
30b57b62da
toggle help
2017-01-19 08:12:49 -08:00
samcake
149e727cf3
Merge pull request #9429 from gcalero/android_forward_shaders
...
Create render forward version of pixel shaders
2017-01-19 00:48:25 -08:00
Stephen Birarda
33cde412b1
make getJSONParameters thread-safe
2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66
pass usesFrustum down to EntityTreeElement
2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95
fix for unpack of OctreeQuery
2017-01-18 17:49:54 -08:00
samcake
05304c72e0
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-18 17:00:20 -08:00
samcake
027bd30cbc
Removing macOS warning
2017-01-18 16:59:50 -08:00
Atlante45
cbc69fbf9e
Fix script preload functions
2017-01-18 16:42:25 -08:00
Brad Davis
1ef4ac9a6c
Additional trace details for GPU timing, frame data updates
2017-01-18 16:19:32 -08:00
Atlante45
e94cccf08d
Fix server script preload funcitons
2017-01-18 16:12:41 -08:00
samcake
e3da6aa9f1
Removing the comment
2017-01-18 15:03:31 -08:00
Stephen Birarda
112b119f17
send entities that just stopped matching filter
2017-01-18 14:58:36 -08:00
Stephen Birarda
5d1b53c600
move map population with properties back
2017-01-18 14:58:36 -08:00
Stephen Birarda
b08bfe93f4
change lastViewFrustumSent to lastQuerySent
2017-01-18 14:58:36 -08:00
Stephen Birarda
a1ad496772
handle match on non-default serverScripts property during entity send
2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034
leverage JSON filter changes to OctreeQuery in EntityServer
2017-01-18 14:58:36 -08:00
Stephen Birarda
f9f958aef1
provide direct access to OctreeQuery from OHV
2017-01-18 14:58:36 -08:00
Stephen Birarda
6e6f2c50b8
leverage OctreeQuery enhancements in EntityScriptServer/OHV
2017-01-18 14:58:36 -08:00
Stephen Birarda
ed68d5a7a2
add JSON filter to OctreeQuery
2017-01-18 14:58:36 -08:00
Zach Fox
0ec01c0dc5
CR feedback
2017-01-18 14:55:53 -08:00
howard-stearns
90c9c5b137
logging change
2017-01-18 14:32:05 -08:00
Gabriel Calero
5602479988
Create render forward version of pixel shaders
2017-01-18 19:18:59 -03:00
howard-stearns
957b1d9ae4
pass just what is given to filter, more or less
2017-01-18 13:22:54 -08:00
howard-stearns
00e53c8ea6
more tractable copy semantics
2017-01-18 13:21:28 -08:00
Zach Fox
346cfbfe02
First checkpoint
2017-01-18 12:55:24 -08:00
Seth Alves
b6188bb73a
fix warnings
2017-01-18 12:49:25 -08:00
Ryan Huffman
3b5b88e719
Move MessageID to AssetUtils
2017-01-18 11:17:13 -08:00
Ryan Huffman
d85f27e992
Add Entities.getServerScriptStatus
2017-01-18 11:15:59 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
howard-stearns
60eb6dca9d
remove debug dump that was printing to screeen during << operator
2017-01-18 10:29:11 -08:00
howard-stearns
2e9b26057e
refactor bumpTimestamp, and fix implementation of wasChanged
2017-01-18 10:27:32 -08:00
howard-stearns
d9182cd38d
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-18 10:02:27 -08:00
Dante Ruiz
1c13f538f7
removed debug output
2017-01-18 17:08:13 +00:00
Dante Ruiz
fa3bea52cd
fixed bug with menu
2017-01-18 16:45:27 +00:00
Dante Ruiz
baff07b0f9
controller with menus finally work
2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b
tabletFocus update
2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9
some what working d-pad
2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8
saving work
2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
Seth Alves
0abb41ca2d
Merge pull request #9413 from hyperlogic/tablet-ui
...
clara.io marketplace works on tablet
2017-01-18 06:37:55 -08:00
Brad Davis
a593a2116a
Removing magic numbers
2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab
Consume fewer resources in AssetServer when interface is running locally
2017-01-17 18:15:39 -08:00
Atlante45
20b7bb0c54
EntityScriptServer tracks server scripts
2017-01-17 16:41:56 -08:00
Zach Fox
7a568ed8a7
Merge pull request #9401 from zfox23/PAL_DisplayName
...
PAL: Editable Display Names & Immediate Update
2017-01-17 16:00:41 -08:00
Atlante45
ff3f175fb7
Fix typos
2017-01-17 15:39:54 -08:00
Anthony J. Thibault
56fc42a2bd
clara.io marketplace works on tablet
2017-01-17 15:38:44 -08:00
Ryan Huffman
340eeb94fa
Add return type to lambdas in EntityTreeRenderer
2017-01-17 15:24:14 -08:00
Ryan Huffman
812aaee48c
Add Entities.reloadServerScripts
2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614
Add serverScripts entity property
2017-01-17 14:47:06 -08:00
David Kelly
341ac685e9
Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists
...
remove ignored avatars from PAL when they disconnect
2017-01-17 14:21:36 -08:00
Atlante45
8d199ded15
Check collision against the right owner
2017-01-17 13:47:45 -08:00
Atlante45
5db37fff95
More entity script server work
2017-01-17 13:47:45 -08:00
Atlante45
163d65d784
Setup basic EntityScriptServer
2017-01-17 13:47:45 -08:00
David Kelly
9b1aaf3bfe
CR feedback
2017-01-17 12:09:47 -08:00
Zach Fox
246f5fb7f5
Add log; fix whitespace
2017-01-17 11:51:09 -08:00
samcake
69f9053e61
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-17 10:55:10 -08:00
samcake
305e308575
avoiding the exclusive filtering behavior
2017-01-17 10:54:45 -08:00
David Kelly
2460e89a57
CR feedback
2017-01-17 09:53:04 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece
remove debuggng logspam
2017-01-16 19:06:36 -08:00
samcake
960f4f0ead
Move the drawBOunds job to DrawTasks
2017-01-16 18:33:42 -08:00
ZappoMan
6e5e9d3492
more work
2017-01-16 18:28:01 -08:00
David Kelly
6c701bb0f0
remove ignored avatars from PAL when they disconnect
2017-01-16 18:22:53 -08:00
Seth Alves
f900629cdb
Merge pull request #9390 from sethalves/load-models-in-keyhole
...
fix physics not starting up when a model is close behind
2017-01-16 18:06:23 -08:00
samcake
0b9b5d595c
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Zach Fox
1e8effdcc4
Packet verison bump
2017-01-16 15:28:53 -08:00
Andrew Meadows
fd28457807
fix cauterization hack
2017-01-16 15:13:28 -08:00
Zach Fox
e98a40c30e
Does this work?
2017-01-16 14:43:30 -08:00
Zach Fox
3b56f46206
Style changes
2017-01-16 13:18:24 -08:00
howard-stearns
09a57efaf3
checkpoint
2017-01-16 12:47:26 -08:00
Zach Fox
32e330320e
Cleanup after rebase
2017-01-16 11:26:57 -08:00
Stephen Birarda
1993e358d6
Merge pull request #9318 from birarda/ovr-platform-entitlement
...
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Zach Fox
2f176f50fa
Another checkpoint
2017-01-16 10:44:54 -08:00
Zach Fox
d2c7342a62
Merge pull request #9352 from zfox23/PerAvatarVolume
...
PAL: Per-Avatar Volume Slider; visual tweaks
2017-01-16 10:34:31 -08:00
Brad Davis
67ce5040ec
Fix bug in FBX parse changes
2017-01-16 10:09:47 -08:00
howard-stearns
831d01c23a
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-16 10:07:06 -08:00
Chris Collins
2557c797af
Merge pull request #9300 from zzmp/graphics/forward-opaque
...
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
Seth Alves
f0248275ec
Merge branch 'load-models-in-keyhole' of github.com:sethalves/hifi into tablet-ui
2017-01-16 06:47:15 -08:00
Seth Alves
050a7e87d2
load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.
2017-01-15 17:04:51 -08:00
ZappoMan
c9c311e275
checkpoint for distance joints
2017-01-15 11:47:48 -08:00
Seth Alves
3b4f5e3023
don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint
2017-01-15 11:27:29 -08:00
ZappoMan
c884b276e2
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-14 22:15:22 -08:00
Seth Alves
0744a148b1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-14 18:00:09 -08:00
Ken Cooke
42e13d1e97
Fix audio failures on systems that return incorrect/unsupported mixFormat
2017-01-14 10:26:13 -08:00
howard-stearns
121d79ef36
getting there, but not yet complete
2017-01-13 16:59:51 -08:00
howard-stearns
f6446c6806
minimum entity edit filter
2017-01-13 13:18:24 -08:00
Zach Fox
b0b6aeac6c
Ken's feedback
2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8
Fixme
2017-01-13 12:59:24 -08:00
Zach Fox
8bb200902f
First pass
2017-01-13 12:57:35 -08:00
Seth Alves
5a81dface9
avoid filling log with bogus warning
2017-01-13 12:00:51 -08:00
ZappoMan
3a9a6e8283
local position tweaks
2017-01-13 09:09:29 -08:00
ZappoMan
ee4df20df3
duh
2017-01-12 19:27:28 -08:00
ZappoMan
2e48444422
hack
2017-01-12 19:03:58 -08:00
Seth Alves
88f3ff7977
Merge pull request #9376 from hyperlogic/tablet-ui3
...
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 18:17:53 -08:00
Anthony J. Thibault
1b4146af6d
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 17:23:06 -08:00
ZappoMan
aed1b69ee0
make the avatar bounding box be avatar local and only change when it actually changes
2017-01-12 17:19:06 -08:00
Seth Alves
e9422cbf1e
fix model scales
2017-01-12 16:38:27 -08:00
Brad Davis
29b160d685
Reduce temp qvariant creation and qvariant conversion
2017-01-12 16:17:03 -08:00
Brad Davis
2383592678
Improve FBX parsing performance by bulk loading of arrays
2017-01-12 16:17:02 -08:00
Seth Alves
5fa379fea2
fix model scales
2017-01-12 16:12:43 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00
Anthony J. Thibault
37804d1875
Fix for linux warning
2017-01-12 13:32:01 -08:00
Anthony J. Thibault
cf138eb1fd
Fixes for qt asserts in debug
...
* The TabletScriptingInterface destructor is invoked on app shutdown after the logging system has been destroyed.
To avoid this I removed the destructor. The log was only for debug purposes anyway.
* Removed calls to setProperty() these calls are not thread safe and were causing asserts during debug.
Instead of getting and setting the property we maintain the TabletProxy state using an enum.
2017-01-12 10:49:41 -08:00
Seth Alves
0746d38cae
Merge pull request #9367 from sethalves/tablet-ui-avoid-hold-action-bootstrap
...
Tablet ui avoid hold action bootstrap
2017-01-12 10:14:01 -08:00
Seth Alves
a47aaea37a
don't bootstrap self with an avatar hold action
2017-01-12 10:12:45 -08:00
ZappoMan
dd85cd9558
one more shot at kens way
2017-01-12 08:48:33 -08:00
ZappoMan
0e600fc8fd
more audio loudness tweaks
2017-01-12 07:56:09 -08:00
ZappoMan
fe06dfdca7
tweak audioLoudness packing
2017-01-11 18:58:43 -08:00
Anthony J. Thibault
26a5b5ed91
Fix for rendering of tablet ModelEntity in desktop mode.
...
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
ZappoMan
0661531e3a
try another version of an 8bit audio loudness
2017-01-11 17:51:12 -08:00
Andrew Meadows
c060fd6a68
restore updateClusterMatrices() in render()
2017-01-11 17:33:30 -08:00
Andrew Meadows
e2130d33d9
speedup cauterizedClusterMatrices math
2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Brad Davis
27293c342c
Change present rate to be an average over 1/10th of a second
2017-01-11 14:27:46 -08:00
Brad Davis
e256f7cccc
Remove sendqueue spam in traces
2017-01-11 14:27:27 -08:00
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -08:00
Andrew Meadows
87bdaae05a
remove scale from ModelMeshPartPayload's transform
2017-01-11 12:38:47 -08:00
ZappoMan
407ad633e0
more cleanup use kens 1 byte audio gain
2017-01-11 11:01:49 -08:00
ZappoMan
5b76eaaf52
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-11 10:22:14 -08:00
Ken Cooke
083c7bc523
Add a local HRTF gain adjustment. Gain adjustments are persistent and properly interpolated.
2017-01-11 10:05:39 -08:00
Seth Alves
9be2f26407
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:55:58 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Andrew Meadows
bd16824d55
remove cruft: Model::_pupilDilation
2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98
add assert and TODO comment
2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0
cleanup class method declarations
2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6
remove cruft
2017-01-11 06:55:13 -08:00
sam
7a01b856f7
Factorization of the modelTransform out of the cluster matrices
2017-01-11 02:33:56 -08:00
Andrew Meadows
44699fc661
modelToWorld rotation not in cluster matrices
2017-01-10 16:21:13 -08:00
Anthony J. Thibault
3f0860f9c3
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c
Merge pull request #9343 from druiz17/menuApp
...
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
Anthony J. Thibault
9db6806026
In desktop mode, tablet is in front of camera.
...
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
to move the tablet appropriately.
There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
ZappoMan
182edf0e9a
change avatarOrientation to use SixByteQuat packing
2017-01-10 09:41:11 -08:00
Dante Ruiz
2fc76d64fd
clean up unused code and files
2017-01-10 09:13:46 -08:00
Dante Ruiz
6705846518
clean up round 1
2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77
added context menu to tablet
2017-01-10 09:13:45 -08:00
Dante Ruiz
3fab901b49
commit chabges
2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1
first commit
2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-10 09:13:34 -08:00
ZappoMan
8bbfb51419
some cleanup
2017-01-10 08:37:01 -08:00
Seth Alves
4a29cce584
adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled
2017-01-10 06:17:40 -08:00
samcake
8c7ec8b0c5
Add profiling in COntext batch execution and shortcuts for trace names
2017-01-09 18:05:02 -08:00
ZappoMan
eadb1758f9
adding some rate debugging
2017-01-09 17:07:47 -08:00
Seth Alves
35577f49d0
change the test for when MY_AVATAR collisions are short-circuited
2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba
set DIRTY_COLLISION_GROUP flag when parentID changes
2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f
if something is a child of the local avatar, never let it collide with MY_AVATAR
2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6
re-evaluate an entities in-bullet status when parentID changes
2017-01-09 15:28:05 -08:00
ZappoMan
13198fd949
add datarate
2017-01-09 13:57:59 -08:00
ZappoMan
636ade9eb7
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 11:29:54 -08:00
Ryan Huffman
39070fe0d1
Merge pull request #9065 from huffman/fix/script-engine-abuse
...
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Anthony J. Thibault
6794ed7cc4
Merge remote-tracking branch 'upstream/master' into tablet-ui
2017-01-09 10:37:46 -08:00
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub
785582057e
more comments
2017-01-08 20:35:52 -08:00
Seth Alves
a9194e1bdb
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-08 11:41:32 -08:00
Howard Stearns
b432ffa78d
Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
...
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -08:00
Zach Fox
b7d64804c1
Remove errant //FIXME
2017-01-05 21:55:09 -08:00
Brad Hefta-Gaub
251495978c
more work on delta sending
2017-01-05 19:46:19 -08:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
Seth Alves
d072b1524a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:27:11 -08:00
Anthony J. Thibault
70078b0e78
Fix for linux build
2017-01-05 15:04:16 -08:00
Brad Hefta-Gaub
86c0d76955
Merge pull request #9314 from jherico/present_priority
...
Use a higher thread priority for Oculus present
2017-01-05 14:02:50 -08:00
Stephen Birarda
46086cdcce
set the OCULUS_STORE property with oculus store arg
2017-01-05 14:02:35 -08:00
Anthony J. Thibault
85de0d3bbf
Added local only spatialized button click sounds to tablet
2017-01-05 13:54:06 -08:00
Zach Fox
2f503d0bcc
Allow for compatibility with old mod.js script
2017-01-05 13:25:27 -08:00
Brad Davis
9bf4804d3d
Use a higher thread priority for Oculus present
2017-01-05 11:04:50 -08:00
Brad Hefta-Gaub
5242375215
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-05 08:57:10 -08:00
Brad Hefta-Gaub
825fc1cfa1
Merge pull request #9309 from kencooke/audio-hdr-volume
...
High Dynamic Range Audio injectors
2017-01-05 08:10:54 -08:00
Ken Cooke
84af90ad96
Bump the audio packet version
2017-01-04 19:59:50 -08:00
Brad Hefta-Gaub
5acae04420
fix some warnings
2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub
acca9dbe87
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Clément Brisset
e34ecac843
Merge pull request #9299 from Atlante45/settings
...
Fix settings hitch
2017-01-04 17:19:44 -08:00
Ken Cooke
9a81a076e8
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-hdr-volume
2017-01-04 15:40:12 -08:00
Ken Cooke
afacb59999
Use logarithmic quantization of injector "volume" over the wire.
...
Allow gains > 1.0 (up to +30dB)
Better quantization at low levels (uniform steps in dB)
2017-01-04 15:38:26 -08:00
Zach Fox
e80ae92327
Also clear personalmutedlist upon reset()
2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Pomerantz
1b948c7a05
add skinned forward model shaders
2017-01-04 15:49:29 -05:00
Zach Fox
dde5f69ac9
More CR & simplifications
2017-01-04 12:41:30 -08:00
Zach Pomerantz
6b984d38d3
add opaque forward model shaders
2017-01-04 15:37:17 -05:00
Brad Hefta-Gaub
2d1dd13d2a
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-04 12:33:02 -08:00
Atlante45
56a25dfdee
Check setting value changed
2017-01-04 11:56:24 -08:00
Dante Ruiz
8327df55e4
removed commented out code
2017-01-04 19:21:03 +00:00
Dante Ruiz
3f34cb863e
removed whitespace
2017-01-04 11:09:26 -08:00
Dante Ruiz
a30ad2709b
Home button fix
2017-01-04 11:09:26 -08:00
Ryan Huffman
601aa51392
Merge branch 'master' into fix/script-engine-abuse
2017-01-04 08:09:06 -08:00
Zach Pomerantz
f7cb2ec85b
add plain forward model shaders
2017-01-03 20:41:57 -05:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4
Merge pull request #9294 from fayeli/tablet-mic-level
...
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Zach Pomerantz
a414ba4cb5
take addPipeline lambda out of initDeferredPipelines
2017-01-03 18:55:13 -05:00
Zach Fox
899dd21328
Lots of CR feedback
2017-01-03 15:43:30 -08:00
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Zach Pomerantz
62eeb0c807
clean RenderPipelines with forward decls
2017-01-03 18:33:14 -05:00
Brad Hefta-Gaub
60d48bcd49
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-03 14:42:59 -08:00
Brad Hefta-Gaub
94fcecb0ec
Merge branch 'master' of https://github.com/highfidelity/hifi into improveScriptRPC
2017-01-03 14:42:37 -08:00
Faye Li
752051834d
function style casting
2017-01-03 13:30:19 -08:00
Faye Li
d8227a686c
fill in updateAudioBar function, invokes qml function
2017-01-03 12:51:26 -08:00
Faye Li
68aacfe544
added "updateAudioBar" function signature in header file
2017-01-03 12:38:23 -08:00
Zach Pomerantz
89917b41fd
add Forward Draw for opaques (no pipelines)
2017-01-03 15:18:22 -05:00
Zach Pomerantz
f8e8065e93
mv DrawBounds to end of ForwardTask
2017-01-03 14:56:47 -05:00
Zach Pomerantz
2e274b026d
fix line lengths
2017-01-03 14:55:47 -05:00
Zach Pomerantz
e406e3d47e
Make Forward DrawBounds enableable
2017-01-03 14:46:51 -05:00
Anthony J. Thibault
850db0b6b3
jsdoc fix for TabletProxy
2017-01-03 11:20:42 -08:00
Brad Hefta-Gaub
4c1aaa376d
remove cruft
2017-01-03 11:13:03 -08:00
Brad Hefta-Gaub
d440532cff
make sure RPC is timely
2017-01-03 11:10:07 -08:00
Zach Pomerantz
26cfc83e20
Merge branch 'master' into graphics/fetch-cull-sort
2017-01-03 14:04:39 -05:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Brad Davis
4b4523579a
Fix mirrored animations
2017-01-02 14:41:35 -08:00
Brad Davis
171440f70b
PR feedback
2016-12-30 17:47:21 -08:00
Brad Hefta-Gaub
45c71fd24d
Merge pull request #9288 from kencooke/audio-hrtf-avx2
...
Faster HRTF
2016-12-30 17:25:32 -08:00
Chris Collins
f077ac7672
Merge pull request #9282 from zzmp/graphics/forward-bg
...
Add background to forward rendering path
2016-12-30 16:55:09 -08:00
Ken Cooke
a42ac89a6d
Faster HRTF
...
New AVX2 implementation of FIR_1x4() achieves 24 FLOPS per clock on HSW/BDW/SKL
Removed old AVX implementation
32-byte alignment of SIMD buffers and tables
Fixed the poorly optimized code produced by GCC -O2
2016-12-30 13:47:31 -08:00
Zach Pomerantz
15656a0592
include spatialSelection in RenderFetchCullSortTask::Output
2016-12-30 15:08:16 -05:00
Brad Hefta-Gaub
82ab8635d7
debugging
2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00
first cut at using wait signals to improve RPC timing
2016-12-30 09:13:21 -08:00
Brad Hefta-Gaub
4b9345d7c6
cleanup accidental change
2016-12-29 16:45:16 -08:00
Brad Hefta-Gaub
84eca0159e
Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
...
Conflicts:
tests/networking/src/ResourceTests.cpp
2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
0c22fcb5c4
better handling of timers
2016-12-29 16:41:14 -08:00
Zach Pomerantz
0e9da87549
FetchSortCull->FetchCullSort
2016-12-29 19:27:37 -05:00
Andrew Meadows
ff19bdceaa
Merge pull request #9281 from AndrewMeadows/unit-test-cleanup
...
fix bitrot in unit tests
2016-12-29 16:21:35 -08:00
Zach Pomerantz
c75dd236f2
rm unused forward pipelines
2016-12-29 19:11:06 -05:00
Zach Pomerantz
d00ae05e26
add background to forward renderer
2016-12-29 19:09:06 -05:00
Zach Fox
10b5b957f2
Ahh...It's beautiful and simple now.
2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115
I'm about to refactor this.
2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424
Getting very close.
2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
2016-12-29 08:53:37 -08:00
Brad Hefta-Gaub
99f180f945
more hacking
2016-12-29 08:16:19 -08:00
Andrew Meadows
be0ca41eb3
make implicit cast explicit
2016-12-28 18:27:34 -08:00
Zach Fox
af1c67a252
Progress!
2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682
It seems to be working, minus removing from list
2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283
First steps, holding off til Howard finishes
2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20
Remove HRS logging
2016-12-28 14:37:19 -08:00
Atlante45
f79c6e08f5
Track dropped frames as reported by the Oculus SDK
2016-12-28 14:18:23 -08:00
Brad Davis
7b90d71205
Fix build
2016-12-28 13:23:05 -08:00
Brad Davis
694c8b5690
Further reduce cost of Duration class when tracing is inactive
2016-12-28 12:37:47 -08:00
Brad Davis
99af7f2819
Reduce unecessary copying in MeshPartPayload::bindMaterial
2016-12-28 12:11:27 -08:00
Brad Davis
d2179b1acf
Reduce tracing impact if tracing isn't active
2016-12-28 12:11:26 -08:00
Brad Davis
3431db548f
Optimize AnimPose(glm::mat) ctor
2016-12-28 12:11:25 -08:00
Brad Davis
dc75894293
Cache more values in AnimSkeleton
2016-12-28 12:11:25 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub
c7a5e873df
debug by sending all
2016-12-27 18:34:47 -08:00
Brad Hefta-Gaub
73bfc069da
more work on only sending changes
2016-12-27 17:19:55 -08:00
Andrew Meadows
b56a15b60a
Merge pull request #9273 from kencooke/audio-ambisonic-src2
...
Improved audio resampler
2016-12-27 17:07:56 -08:00
Brad Davis
901c020aae
Optimizations, SIMD and const correctness
2016-12-27 15:39:38 -08:00