Anthony J. Thibault
31f361d49c
Moved fps timing to beginning of paintGL
...
This should improve accuracy.
However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
2015-11-03 15:51:18 -08:00
Anthony J. Thibault
c139b62217
fps calculation now based on moving average
...
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
2015-11-03 11:19:49 -08:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
samcake
fc15c7cd98
Adding the ApplicationStateDevice to the APplication class and add one entry ythere
2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
Howard Stearns
93e908a592
Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.
2015-10-13 12:15:13 -07:00
Atlante45
eea89ba010
CR - Rename method
2015-10-12 14:26:28 -07:00
Atlante45
7b41efcf86
All file types eligible for upload to asset server
2015-10-12 13:35:21 -07:00
Atlante45
2229f942df
Spawn fbx dropped in front of avatar
2015-10-09 12:23:19 -07:00
Atlante45
b666acdb26
Add fbx upload on drop
2015-10-09 12:23:19 -07:00
Atlante45
327154b0c0
Make _acceptedExtensions static const
2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
bfd014203e
fix a bunch of warnings
2015-10-07 14:48:42 -07:00
Atlante45
7b25c9d417
More header cleanup
2015-10-06 13:57:50 -07:00
Atlante45
b63df98b8b
More unused
2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9
Remove unused variables
2015-10-06 13:57:48 -07:00
Atlante45
e9b7125894
Misc cleanup
2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb
Fix view frustum preference
2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544
Remove unused members (Mostly mouse stuff)
2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89
Removed _myAvatar from Application
2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6
Fix warning
2015-10-06 13:56:24 -07:00
Atlante45
9c7a480fda
Remove shadowMatrices/Distances
2015-10-06 13:56:23 -07:00
Atlante45
8c653c70fb
Remove fps throttle from Application
2015-10-06 13:56:23 -07:00
Atlante45
4ccc2bbcd0
Enclose entire functions in ifdef
2015-10-06 13:56:23 -07:00
Atlante45
dde11c5cd1
More unused
2015-10-06 13:56:23 -07:00
Atlante45
34bba28775
More header cleanup
2015-10-06 13:56:22 -07:00
Atlante45
f55f146d1b
More code cleanup
2015-10-06 13:56:22 -07:00
Atlante45
38f23ef79e
Remove Application friend
2015-10-06 13:56:22 -07:00
Atlante45
311edabe51
More header cleanup
2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff
More unused
2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5
Simplify friends window
2015-10-06 13:56:21 -07:00
Atlante45
77a7814854
Move sendPingPackets
2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc
Remove unused methods
2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f
Fix startup timer
2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e
Remove unused members
2015-10-06 13:56:20 -07:00
Atlante45
92e974929c
Move tray icon to MainWindow
2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c
Remove 4 Application static methods
...
- Replace by lambda
- Cleaned up global scope
2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b
Replace Application::getInstance() with qApp
2015-10-06 13:56:19 -07:00
Brad Hefta-Gaub
d14820d3ef
Merge pull request #5880 from thoys/20668
...
Worklist job #20668 - JS: Add option to listen audio from camera
2015-09-23 20:40:32 -07:00
Thijs Wenker
f38bb77d0a
less calls to QHash
2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45
Merge branch 'master' of https://github.com/worklist/hifi into 20655
2015-09-22 18:44:25 +02:00
Thijs Wenker
617f048883
Added JS interface to change audio listening position / orientation in Interface
...
- MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions
2015-09-22 13:40:33 +02:00
Brad Hefta-Gaub
0ba1e8c945
remove renderingInWorldInterface signals
2015-09-18 09:49:57 -07:00
Thijs Wenker
9992f4b5c5
Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService:
...
made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename
2015-09-16 01:16:58 +02:00
Anthony J. Thibault
90f46ba2c8
Added hand state machines to AnimGraph.
...
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
2015-09-14 18:54:12 -07:00
Seth Alves
e65ef93663
Merge pull request #5778 from jherico/homer
...
Fixing some entity race condition crashes
2015-09-11 17:54:53 -07:00
Andrew Meadows
9c6060160a
Merge pull request #5784 from howard-stearns/rationalize-rig-settings
...
Rationalize rig settings
2015-09-11 16:56:44 -07:00
