Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-01 01:49:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34462 commits 25 branches 0 tags 1.1 GiB
Commit graph

13746 commits

Author SHA1 Message Date
David Rowe
8f376247f0 Fix calculation of corrected look-at position in HMD view 2015-08-11 20:25:02 -07:00
David Rowe
0f56285283 Fix HMD look-at positions and lines 2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712 Fix to use new HMD methods 2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub
b726769f15 Merge pull request #5402 from highfidelity/plugins 
New plugins architecture
 2015-08-11 11:11:27 -07:00
Seth Alves
cbe38d5fa5 Merge pull request #5533 from ctrlaltdavid/20637 
CR for 20637 - Add WebWindow setPosition() method
 2015-08-11 11:03:14 -07:00
Brad Hefta-Gaub
35d6528d08 Merge pull request #5550 from jherico/marge 
PLUGINS - Cleaning up HMD tools
 2015-08-11 10:46:59 -07:00
David Rowe
84feaeb703 Merge branch 'master' into 20639 2015-08-11 10:33:17 -07:00
Bradley Austin Davis
7694c1c0a6 Cleaning up HMD tools 2015-08-10 21:39:36 -07:00
Brad Davis
19d31938d3 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 21:25:35 -07:00
David Rowe
2c1ba9b6b1 Fix avatar lean forwards and sideways per HMD movements 2015-08-10 21:25:18 -07:00
David Rowe
f7dc5480b7 Fix #include path for OSX/Linux 2015-08-10 20:20:51 -07:00
David Rowe
80e296edd0 Merge branch 'master' into 20639 2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac Start eye tracker streaming such that don't block Interface 
Start method is called in a separate thread.
 2015-08-10 19:19:29 -07:00
Bradley Austin Davis
61ecee93b8 Fix mis-positioning of QML elements when moving from retina to non-retina display 2015-08-10 15:18:49 -07:00
Seth Alves
74287c3cf5 Merge pull request #5482 from ericrius1/polyLineInProgress 
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
 2015-08-10 14:57:52 -07:00
David Rowe
81d8edae5f Add missing 5 point calibration 2015-08-10 13:23:14 -07:00
David Rowe
e7beb544f6 Log successfully loading eye tracker calibration 2015-08-10 13:22:46 -07:00
David Rowe
658434e020 Automatically save and restore eye tracker calibration 
Automatically saves and restores just a single calibration so that user
doesn't have to manually save or load, which isn't very convenient to do
with an HMD on.
 2015-08-10 13:20:42 -07:00
David Rowe
4f3c4a5312 Tidy up handling of eye tracker streaming 2015-08-10 12:52:47 -07:00
Howard Stearns
88505c180d Merge branch 'master' of https://github.com/highfidelity/hifi into restore-eye-joint-rotations 2015-08-10 12:34:59 -07:00
Howard Stearns
964d04d24f Restore correct space for eye joint rotations. 
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
 2015-08-10 12:34:01 -07:00
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -07:00
Stephen Birarda
5e3d3fc06b fix for indentation in BandwidthDialog 2015-08-10 10:03:53 -07:00
Brad Davis
57408c4338 Automatically show HMD tools when switching an HMD plugin 2015-08-09 12:14:29 -07:00
Brad Davis
5515b9d8ee Decouple Application and plugin definitions, cleanup container usage 2015-08-08 17:51:16 -07:00
Bradley Austin Davis
2878950dbe Fix crash on startup on mac 2015-08-08 15:26:38 -07:00
Brad Davis
751db23bc8 Fixing naming, and improving viewport handling 2015-08-08 14:19:43 -07:00
Brad Davis
639a0822fe Fixing aspect ratio 2015-08-08 14:08:41 -07:00
Brad Davis
ba498e8f33 Fixing plugin construction after removing OVR dependency from interface 2015-08-08 14:02:26 -07:00
Brad Davis
ccc4a59992 Cleanup and PR comments 2015-08-08 13:54:37 -07:00
Brad Davis
4b5c71e16d Merge fixes 2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.h
 2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2 Merge branch 'master' into 20639 2015-08-07 18:26:56 -07:00
David Rowe
90637272c5 Add WebWindow setPosition() method 2015-08-07 17:38:41 -07:00
Andrew Meadows
331c8c0967 Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements 
Improvements to FloatingUIPanels.
 2015-08-07 17:21:51 -07:00
David Rowe
b54c2526c1 Fix rendering own look-at vectors in HMD mode 
Vectors now originate at user's physical eyeballs rather than at user
avatar's eye separation.
 2015-08-07 16:13:25 -07:00
Andrew Meadows
c0d287f48d Merge pull request #5527 from ZappoMan/lod 
change LOD dialog to no longer reset when you close the dialog box
 2015-08-07 16:10:24 -07:00
Andrew Meadows
48c5a227a7 Merge pull request #5528 from ZappoMan/removeBrokenShadows 
remove shadow menu items
 2015-08-07 16:09:00 -07:00
Bradley Austin Davis
fb2c84484e Merge remote-tracking branch 'upstream/master' into plugins 2015-08-07 15:26:43 -07:00
David Rowe
3995c4476d Add temporary debug info for tracking down invalid scale value assert 2015-08-07 14:38:43 -07:00
Seth Alves
b1e69537f3 Merge pull request #5524 from howard-stearns/cleanup-jointstate 
Clean Up JointState
 2015-08-07 13:50:02 -07:00
David Rowe
b70c1a4960 Merge branch 'master' into 20639 2015-08-07 12:33:13 -07:00
David Rowe
ea03067a02 When eye tracking data is lot for > N seconds handle as "not tracking" 
Revert to default look-at behaviour and saccades until tracking resumes.
 2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e Resume eye tracking at start-up if was running at shut-down 2015-08-07 11:59:11 -07:00
Zander Otavka
743e73874f Add back the anchor to panel transform names. 
position -> anchorPosition
rotation -> anchorRotation
scale -> anchorScale
 2015-08-07 11:38:33 -07:00
ZappoMan
87f609b9af remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows 2015-08-07 11:26:07 -07:00
Ryan Huffman
41e68b1c52 Disable back-face culling when rendering BillboardOverlay 2015-08-07 10:59:54 -07:00
ZappoMan
8441868e74 change LOD dialog to no longer reset when you close the dialog box 2015-08-07 10:32:03 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Zander Otavka
f9630942aa Small tweaks to improve code readability. 2015-08-07 09:31:21 -07:00
Zander Otavka
a46cc4e1c3 Fix issue with offsetRotation being applied twice. 2015-08-07 09:30:45 -07:00
Zander Otavka
09bb61e4d8 Add backwards compatibility for Image3DOverlays. 
Using "billboard" to create an Image3DOverlay is deprecated.  Instead,
use "image3d" or, even better, use overlayManager.js.
 2015-08-07 02:45:05 -07:00
Zander Otavka
3356bf31ac Refactor billboarding into Billboardable class. 2015-08-07 02:34:56 -07:00
Zander Otavka
3dcfa84a87 Fix billboarding behavior. 
Billboards now always face the camera position.  Also, OverlayPanels can
be set to face the avatar.
 2015-08-07 01:38:33 -07:00
David Rowe
e37fd956ed Fix look-at target position getting stuck when avatar moves out of range 2015-08-06 22:51:25 -07:00
Zander Otavka
0b4be8fca2 Improve transforms for panels and attachables. 
Add offsetScale to PanelAttachable for scaling all the contents of a
panel properly.  Also reduce the number of transform operations per
second while rendering a PanelAttachable Overlay.
 2015-08-06 21:46:55 -07:00
David Rowe
738c5658fa Guard against NaNs in eye tracker look-at position 2015-08-06 20:46:51 -07:00
Howard Stearns
a840a17106 Change name originalRotation defaultRotation. 2015-08-06 19:45:58 -07:00
Zander Otavka
6e8c154c42 Undo registering PropertyBinding as a meta type. 2015-08-06 18:54:08 -07:00
Zander Otavka
fa24df765d Register OverlayPanel binding map as a meta type. 2015-08-06 18:07:59 -07:00
Zander Otavka
f870f19837 Make transforms cascade down the pannel chain. 2015-08-06 17:29:37 -07:00
David Rowe
427b8b973c Fix excluding saccades when doing eye tracking 2015-08-06 17:20:03 -07:00
Zander Otavka
2aacd17843 Make OverlayPanel PanelAttachable. 2015-08-06 16:58:03 -07:00
Howard Stearns
42cc34cd64 JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx. 2015-08-06 16:54:09 -07:00
David Rowe
551c00dc23 Fix look-at position calculation when in HMD display 
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
 2015-08-06 16:41:06 -07:00
Zander Otavka
be4e827281 Merge: master -> panel-attachable-improvements. 2015-08-06 16:29:38 -07:00
Zander Otavka
c7639537d0 Use implicit copy constructor for PanelAttachable. 2015-08-06 16:13:21 -07:00
Zander Otavka
497713b020 Rename a few more confusing names. 
setTransforms -> applyTransformTo
attachedPanel -> parentPanel
 2015-08-06 15:45:07 -07:00
Ryan Huffman
dd2c0be2d2 Add check in BillboardOverlay::render to make sure _texture is valid 2015-08-06 15:43:02 -07:00
Ryan Huffman
8ebf34e93f Fix BillboardOverlay breaking when changing url 2015-08-06 15:15:11 -07:00
Sam Gondelman
4c7c2e9390 fixing more connexion problems 2015-08-06 15:06:05 -07:00
Sam Gondelman
54f64b62eb Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-08-06 14:45:26 -07:00
Zander Otavka
b94be926f8 Mass renaming to be more logical/concise. 
FloatingUIPanel -> OverlayPanel
anchorPosition -> position
offsetRotation -> rotation
facingRotation -> offsetRotation
floatingUIExample.js -> overlayPanelExample.js
 2015-08-06 14:23:04 -07:00
Ryan Huffman
cefb7be51d Disable back-face culling when rendering BillboardOverlay 2015-08-06 14:09:32 -07:00
Bradley Austin Davis
985bdb2190 Fixing merge 2015-08-06 11:52:38 -07:00
Zander Otavka
6165e7e6ca Improve cross-thread support for panel children. 2015-08-06 11:40:49 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Brad Davis
9215ea8894 Merge pull request #5516 from Atlante45/warnings 
Fix warning and remove unused headers
 2015-08-05 19:12:09 -07:00
Anthony J. Thibault
c3fc37df18 Added true boneSets to AnimOverlay. 2015-08-05 18:07:56 -07:00
Zander Otavka
021dff63b4 Visibility now cascades down panel children. 
For an overlay to render, it, and all of its ancestor panels, must be
set visible.
 2015-08-05 16:57:03 -07:00
David Rowe
d7b42e264e Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00
Zander Otavka
865067aad9 Add ability to bind a panel to an entity. 2015-08-05 16:12:46 -07:00
Howard Stearns
ca6d798aa5 Don't try to animate other people's avatars! 2015-08-05 15:59:22 -07:00
Zander Otavka
481624b48c Re-work panel position and rotation binding. 2015-08-05 14:21:23 -07:00
David Rowe
e8eac7db34 Render look-at vectors and target in first person view 2015-08-05 13:40:57 -07:00
David Rowe
a15943d941 Increase size of look-at target sphere 2015-08-05 13:39:26 -07:00
Sam Gondelman
513c652ab3 merge from master and attempt to fix connexion conflicts 2015-08-05 12:42:39 -07:00
Sam Gondelman
113c4ea28b exposing palm velocity and angular velocity to js 2015-08-05 12:17:15 -07:00
David Rowe
3be2ddf234 Fix calibration menu item actions 2015-08-05 12:05:04 -07:00
Anthony J. Thibault
2154f76202 Added some comments to AnimNode, AnimClip & AnimBlendLinear. 2015-08-05 12:03:20 -07:00
Anthony Thibault
49be7c49b7 Merge pull request #5506 from howard-stearns/smooth-faded-animations 
Smooth fading of animations in and out.
 2015-08-05 12:02:44 -07:00
Andrew Meadows
59f6988e56 Merge pull request #5465 from SamGondelman/connexionFixes 
Trying to fix/clean up 3DConnexion stuff
 2015-08-05 11:16:34 -07:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
Atlante45
dfaa16d15c Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-05 10:39:02 -07:00
Howard Stearns
2f2b59b6b6 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-05 10:05:05 -07:00
Zander Otavka
4965f1adda Fix a facingRotation issue for PanelAttachable. 2015-08-05 09:20:55 -07:00
Howard Stearns
6ea06ffc3c Merge pull request #5504 from sethalves/rig 
set-hand-position in rig
 2015-08-05 09:05:29 -07:00
Philip Rosedale
df60453344 Merge pull request #5462 from ctrlaltdavid/20574 
CR for 20574 - Use single file robot model as fallback for full avatar models
 2015-08-05 08:55:00 -07:00
Philip Rosedale
06710618d1 Merge pull request #5463 from ctrlaltdavid/20640 
CR for 20640 - Add DDE option to couple eyelids
 2015-08-05 08:47:28 -07:00
David Rowe
0c174e27c3 Merge branch 'master' into 20639 2015-08-04 18:36:53 -07:00
David Rowe
fae26d901c Add menu option to render look-at targets 2015-08-04 18:34:56 -07:00
Anthony J. Thibault
5d83976e2a Added AnimBlendLinear + tests. 
MyAvatar now does a sine wave blend between a walk
and a walk animation.
 2015-08-04 18:14:50 -07:00
Anthony J. Thibault
559367db4a Got to the bottom of the bind pose question. 
When TRUST_BIND_TRANSFORM is defined in AnimSkeleton, the bind pose is taken
from the FBXJoint::bindTransform field, which is correct for all joints
bound to actual geometry.  Basically it's not trust worthy for bones NOT bound to anything.

When TRUST_BIND_TRANSFORM is not defined, the bind pose is taken from the other
FBXJoint fields.  Unfortunatly these poses are NOT the bind pose, but instead
are taken from the FBX files 'resting' pose. i.e. frame 0.
 2015-08-04 18:14:49 -07:00
Anthony J. Thibault
69cc270802 removed scale for fight club model 2015-08-04 18:14:48 -07:00
Anthony J. Thibault
55da34f713 Better debug rendering of animations. 
* added mat4 cast and mat4 ctors to AnimPose.
 2015-08-04 18:14:48 -07:00
Anthony J. Thibault
df79463750 WIP, animNode rendering 2015-08-04 18:14:48 -07:00
Anthony J. Thibault
b8bae7cc3f Debug rendering of MyAvatar’s skeletonModel skeleton 2015-08-04 18:14:47 -07:00
Anthony J. Thibault
91ca13c66d Added AnimDebugDraw to render-utils 2015-08-04 18:14:46 -07:00
David Rowe
c771574578 Add 5 point eye tracker calibration option 2015-08-04 18:02:34 -07:00
Howard Stearns
731bcba956 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-04 17:27:23 -07:00
Howard Stearns
61198a658c Smooth fading of animations in and out. 
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
 2015-08-04 17:04:15 -07:00
David Rowe
72c4ab33a1 Handle eye calibration errors 2015-08-04 16:54:21 -07:00
David Rowe
11ec5f5ddf Don't display duplicate error message box 2015-08-04 16:46:48 -07:00
Sam Gateau
d2360d1406 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 16:31:33 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
Bradley Austin Davis
4f759ee46a Merge remote-tracking branch 'upstream/master' into core 2015-08-04 16:26:16 -07:00
Seth Alves
c3fc1d5391 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-08-04 16:13:58 -07:00
Seth Alves
9af6b00403 Merge pull request #5500 from SamGondelman/controlBug 
Possible fix for infrequent inability to move on Windows startup
 2015-08-04 16:13:47 -07:00
Seth Alves
9171033f21 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-08-04 16:06:38 -07:00
David Rowe
b5fbfc645f Tidy eye tracker interface 2015-08-04 15:57:19 -07:00
Seth Alves
a218f0de83 Merge pull request #5483 from AndrewMeadows/caesium 
remove legacy shapes and friends
 2015-08-04 15:40:20 -07:00
SamGondelman
52be44d621 uninitialized value 2015-08-04 14:50:38 -07:00
David Rowe
fefddb631f Add 1 and 3 point eye tracker calibration 2015-08-04 14:46:03 -07:00
Zander Otavka
22453aa3ce Improve inner workings of overlay API. 
More stuff is known to the C++, and a panel object in JavaScript can be
gotten by ID from another thread.
 2015-08-04 14:22:21 -07:00
Zander Otavka
055133b82e Refactor inheritance for billboard overlays. 
BillboardOverlays is now Image3DOverlay.  Billboard3DOverlay is the base
class for both Image3DOverlay and Text3DOverlay, and it is
PanelAttachable.
 2015-08-04 14:22:21 -07:00
Zander Otavka
c0838f4e58 Bring text closer to it's background. 2015-08-04 14:22:21 -07:00
Zander Otavka
28050a2ac9 Fix PanelAttachable transformations. 
Apply the offsetPosition of the PanelAttachable after the facingRotation
of the FloatingUIPanel, not before.
 2015-08-04 14:22:21 -07:00
Zander Otavka
be558eb62e Make Text3DOverlay a PanelAttachable. 2015-08-04 14:22:20 -07:00
Sam Gateau
34183b9ddf COmmenting the remove of the glLIneWidth and demoving dead code 2015-08-04 12:36:35 -07:00
Sam Gateau
d07ab353fc remove glLineWidth completely because it s not available anymore for wide lines in core 2015-08-04 11:57:20 -07:00
Stephen Birarda
52b1b647a2 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-08-04 10:51:23 -07:00
Bradley Austin Davis
3c76c0d4b6 Merge remote-tracking branch 'upstream/master' into core 2015-08-04 10:23:54 -07:00
Thijs Wenker
4bf6f8ed77 ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model. 2015-08-04 14:47:13 +02:00
Bradley Austin Davis
29c9e6e45e Updating plugins to core profile 2015-08-04 00:33:03 -07:00
Bradley Austin Davis
0edd7fd3c4 Merge fix 2015-08-04 00:32:38 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f Merge branch 'master' into core 2015-08-03 22:18:38 -07:00
David Rowe
b71ad31812 Merge branch 'master' into 20639 2015-08-03 20:53:12 -07:00
Ryan Huffman
027adf73bb Merge branch 'master' of github.com:highfidelity/hifi into asset-server 2015-08-03 16:41:24 -07:00
Sam Gondelman
95232920f1 trying to fix mac linking errors 2015-08-03 16:35:34 -07:00
Sam Gondelman
c9780338ae merge from master 2015-08-03 16:27:45 -07:00
Ryan Huffman
fc9cd836ce Update AssetScriptingInterface 2015-08-03 16:25:37 -07:00
Ryan Huffman
4e1b52a022 Add thread for AssetClient 2015-08-03 16:25:07 -07:00
ericrius1
12770edbe1 Merge branch 'master' into polyLineInProgress 2015-08-03 15:52:26 -07:00
Eric Levin
3f5f75d6d2 Merge pull request #5430 from AlexanderOtavka/floating-ui 
Improvements to overlays.
 2015-08-03 14:35:52 -07:00
Andrew Meadows
b00d47d62e merge master into cleanup of legacy shapes 2015-08-03 11:19:29 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
David Rowe
7749b912ea Merge branch 'master' into 20639 2015-08-03 09:55:35 -07:00
ericrius1
f50c482451 Merge branch 'master' into polyLineInProgress 2015-08-03 08:46:01 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Brad Davis
8ac33453b5 Fix v-sync functionality 2015-08-01 22:10:47 -07:00
Brad Davis
5c07a7d85b Merge remote-tracking branch 'upstream/master' into plugins 2015-08-01 21:58:05 -07:00
Brad Davis
180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
 2015-08-01 20:01:59 -07:00
ZappoMan
771ce6dca3 remove QUAD_STRIP from Circle3DOverlay 2015-08-01 17:20:48 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
Sam Gondelman
647bb2b9ce removing unnecessary weak link 2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94 more work on cleaning up connexion 2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236 trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -07:00
Howard Stearns
2713115336 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 18:05:47 -07:00
SamGondelman
8908c7c141 working on windows crash 2015-07-31 17:55:59 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Brad Davis
1e44495f7c Initialize the GL widget with the 4.1 core profile 2015-07-31 16:21:47 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Stephen Birarda
12ad60a6b5 add a missed char[] in OctreePacketProcessor 2015-07-31 14:48:54 -07:00
Andrew Meadows
661a916ebd merge rig into cleanup (removal of legacy shapes) 
Conflicts:
	interface/src/avatar/Avatar.h
	tests/physics/src/ShapeColliderTests.cpp
	tests/physics/src/ShapeColliderTests.h
 2015-07-31 13:40:51 -07:00
ZappoMan
3d9b0f1be5 set focus on enter hmd 2015-07-31 13:23:35 -07:00
Zander Otavka
7973c2d469 Fix compile issue on Linux and Windows. 
Shoutout to Andrew for help finding the missing #include.
 2015-07-31 11:26:04 -07:00
Zander Otavka
9bd72e5769 Tweak PanelAttachable::setTransforms. 
Use reference instead of pointer, and make it virtual.
 2015-07-31 11:26:04 -07:00
Zander Otavka
bc5ef8eb11 Clean up C++ relating to panels. 2015-07-31 11:26:04 -07:00
Zander Otavka
da2afca391 Expose overlay type checking to JavaScript. 2015-07-31 11:26:04 -07:00
Zander Otavka
1d37df4775 Improve and optimize panel transformations. 2015-07-31 11:26:04 -07:00
Zander Otavka
e5b8701215 Add toggle event for address bar. 2015-07-31 11:26:04 -07:00
Zander Otavka
1655dea2c3 Fix BillboardOverlay first person render bug. 2015-07-31 11:26:04 -07:00
Zander Otavka
0524155349 Expose face tracking to the script engine. 2015-07-31 11:26:04 -07:00
Zander Otavka
c77a91eb63 Expose address bar toggling to scripts. 2015-07-31 11:26:04 -07:00
Zander Otavka
c4cb6fba74 Improve BillboardOverlay::findRayIntersection. 2015-07-31 11:26:03 -07:00
Zander Otavka
377a1a54ae Add abstraction layer for Overlays.h. 
`examples/libraries/overlayUtils.js` allows you to manage overlays in an
object oriented manner.  Instead of:

    var billboard = Overlays.addOverlay("billboard", { visible: false });
    ...
    Overlays.editOverlay(billboard, { visible: true });
    ...
    Overlays.deleteOverlay(billboard);

You can now do:

    var billboard = new BillboardOverlay({ visible: false });
    ...
    billboard.visible = true;
    ...
    billboard.destroy();
 2015-07-31 11:26:03 -07:00
Zander Otavka
ed7fc07ab1 Fix cloning bug for BillboardOverlay. 2015-07-31 11:26:03 -07:00
Zander Otavka
173a79867c Extend Overlays API to allow for 3D UI panels. 
Currently, only BillboardOverlays can be added to a panel, but more
types of overlays will be supported in the future.
 2015-07-31 11:26:03 -07:00
Zander Otavka
dff6b0a456 Fix isFacingAvatar property on BillboardOverlay. 2015-07-31 11:26:03 -07:00
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
Howard Stearns
b685378ab0 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
Seth Alves
c1f777e18f move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:39:01 -07:00
SamGondelman
25e75bcc79 WIP: trying to fix windows not finding framework 2015-07-30 18:11:24 -07:00
Bradley Austin Davis
f3e701e0d5 Don't allow leaving VR mode to target the rift 2015-07-30 17:40:02 -07:00
Bradley Austin Davis
ac0ec0a458 Ensure the app moves back to a non-rift screen if the saved geometry is bad 2015-07-30 17:09:08 -07:00
Brad Davis
352ae24fab Removing unused function 2015-07-30 15:35:04 -07:00
Brad Davis
948d5dab0c Cleaning up diff 2015-07-30 15:30:05 -07:00
Sam Gondelman
a01a4f929f removing unnecessary weak link 2015-07-30 15:14:51 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9 Clear translation on root joint. 
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
 2015-07-30 15:04:27 -07:00
Sam Gondelman
b8f7d4b8c8 more work on cleaning up connexion 2015-07-30 13:19:05 -07:00
Brad Davis
ba58e95f53 Fix 3dconnextion usage 2015-07-30 13:06:43 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Bradley Austin Davis
fccb07dc93 Tweaking timing of geometry restoration 2015-07-30 12:44:47 -07:00
Howard Stearns
5e3bebcd86 Merge pull request #12 from hyperlogic/ajt/head-model-fix 
Re-added neck and eye procedural animation to FaceModel.
 2015-07-30 12:32:17 -07:00
Anthony J. Thibault
314434e068 Re-added neck and eye procedural animation to FaceModel. 
This is only used in the case of split head/body avatars.
 2015-07-30 12:27:28 -07:00
Bradley Austin Davis
a260be9a4d HMDTools dialog restoration phase 2, electric boogaloo 2015-07-30 12:25:21 -07:00
Sam Gondelman
b19376ef6e trying to fix connexion linker errors, general style fixes, renamed some files 2015-07-30 12:17:36 -07:00
Brad Davis
5878a4661c Restoring HMD tools dialog, phase 1 2015-07-30 11:35:55 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Brad Davis
382ef057b0 Revert to using QGLWidget 2015-07-30 10:59:05 -07:00
Howard Stearns
06aa107762 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605 
Removed the  line where the directory is stripped off the RelativeFile
 2015-07-30 07:30:01 -07:00
David Rowe
46b4817155 Add DDE option to couple eyelids 
Use the most "open" value for both.
 2015-07-29 20:08:58 -07:00
Brad Hefta-Gaub
398bace83c Merge pull request #5439 from samcake/punk 
Remove alias gl calls from Batch and Introduce a ResetStage Batch command
 2015-07-29 20:05:06 -07:00
Atlante45
db5e5a4f75 Remove Environment Server 2015-07-29 20:04:29 -07:00
David Rowe
83ab37be0f Merge branch 'master' into 20639 
Conflicts:
	interface/src/Menu.h
 2015-07-29 19:46:01 -07:00
David Rowe
f943dc8492 Use single file robot model as fallback for full avatar models 
Fixes having only a skeleton with no head if an invalid full model file
is configured.
 2015-07-29 19:34:05 -07:00
Howard Stearns
4e7d191fb1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 18:53:38 -07:00
samcake
e32e45ed2b make sure the writting mask is on for depth buffer 2015-07-29 18:06:46 -07:00
Howard Stearns
59fe2a168e Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-29 18:00:11 -07:00
samcake
ac46b2bd17 Keep the resetstage in 2015-07-29 17:38:23 -07:00
Anthony J. Thibault
c2934bdb5d Fix avatar head, eye and torso twist. 
* Updated SkeletionModel::updateRig to explicitly pass a set of HeadParameters
  to the rig to do procedural animation.
* Moved torso lean procedural animation from SkeletonModel into Rig.
* Moved eye tracking procedural animation from HeadModel into Rig.
* Moved neck procedural animation from HeadModel into Rig.
 2015-07-29 17:35:29 -07:00
Sam Gateau
8b7ad9cfcb merge with upstream 2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83 merge with upstream 2015-07-29 17:11:13 -07:00
Sam Gondelman
9025bc3ead press o to toggle overlays in case you don't have a middle mouse click 2015-07-29 16:43:25 -07:00
Sam Gateau
5baf993c24 fixing the stars again 2015-07-29 16:27:45 -07:00
David Rowe
02ae008c9c Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-07-29 16:24:30 -07:00
David Rowe
212327dd46 Fix eye tracker conditional compile 2015-07-29 16:20:45 -07:00
Sam Gateau
269db0ff6f fixing the stars rendering that was vilently broken durign the hunt for GPUCOnfig.h includes 2015-07-29 16:08:16 -07:00
SamGondelman
42e7c5278c attempt to fix ray picking in standing mode 2015-07-29 16:04:57 -07:00
Howard Stearns
d73f133daa Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 15:45:00 -07:00
Howard Stearns
838711e526 Remove avatar->shift hips for idle animations. 
See https://app.asana.com/0/32622044445063/43127903156601
 2015-07-29 15:27:50 -07:00
David Rowe
f2ae7bfac0 Don't apply saccades to tracked eyes 2015-07-29 15:14:43 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
David Rowe
ed259e6bbb Merge branch 'master' into 20639 2015-07-29 11:44:58 -07:00
David Rowe
e5d2a78980 Don't check SMI Eye Tracker menu item if tracking doesn't start 2015-07-29 11:33:21 -07:00
samcake
4ebc75da1f Merge pull request #5369 from ericrius1/hitEffect 
Added functionality for displaying a screen-space hit effect
 2015-07-29 11:28:08 -07:00
David Rowe
76fe0c8764 Control eyes only if in HMD view or simulating 2015-07-29 11:14:00 -07:00
Andrew Meadows
a1e6fdc4b2 Merge pull request #5435 from MarcelEdward/hifi-2-20069 
Hifi 2 20069
 2015-07-29 11:13:30 -07:00
Howard Stearns
a9f76324b5 Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2 2015-07-29 10:49:27 -07:00
Brad Davis
900c2c11df Another whack at touch events 2015-07-29 10:29:27 -07:00
ericrius1
697cb4c9d0 fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
Brad Davis
07553e7a7c Accept touch events in the GL window 2015-07-29 10:00:41 -07:00
Howard Stearns
7fdba9132e Revert Camera.h changes. 2015-07-29 09:55:19 -07:00
Howard Stearns
66621d31e8 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 09:26:36 -07:00
Brad Davis
f0d0979ade Fix UI element placement 2015-07-29 09:19:09 -07:00
Howard Stearns
68aec1fd36 Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-29 09:12:44 -07:00
Howard Stearns
327ecfe62c Be less noisy. 2015-07-29 09:11:58 -07:00
Andrew Meadows
2c66af67e9 Merge howard/rig into andrew/caesium 2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09 remove legacy shapes 2015-07-29 09:02:24 -07:00
David Rowe
1ae920368d Calculate and look at the point the eye tracker user is looking at 2015-07-29 08:38:20 -07:00
Marcel Verhagen
1d29fb9d7f replace tabs with whitespaces. 2015-07-29 14:56:24 +02:00
Brad Davis
bb29127eff Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 23:14:41 -07:00
Brad Davis
87bd930854 Renaming mode menu 2015-07-28 23:14:34 -07:00
Anthony J. Thibault
608898848f Fix for edit.js Camera.getPosition(), getOrientation() and getRotation() 
JavaScript has problems with const refs, apparently.
Camera.getPosition() was returning undefined.
 2015-07-28 19:49:06 -07:00
Anthony J. Thibault
044ea2ace5 Changed mirror position to not be achored to the head. 
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
 2015-07-28 19:31:43 -07:00
Anthony J. Thibault
ce7e385900 Updated comment 2015-07-28 18:03:03 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Anthony J. Thibault
b06485c266 Remove cauterize code from Rig and move it back into Model. 
* cauterize code is used as at render time and is not dependent on
  the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
  makes the decision to perform cauterization or not in preRender.
 2015-07-28 17:45:33 -07:00
Brad Davis
3210037bc1 Merge pull request #5449 from ZappoMan/plugins 
Plugins Branch - Fix a crash in pendingChanges.updateItem() for the Particle Entity
 2015-07-28 16:49:30 -07:00
Brad Davis
91768b3992 Merge pull request #5450 from SamGondelman/sam/input-plugins 
Plugins branch - re-remove hand lasers
 2015-07-28 16:25:55 -07:00
Brad Davis
8202862750 Working on display plugins stability 2015-07-28 16:22:22 -07:00
Brad Davis
ead9bbe866 Moving display plugins menu 2015-07-28 16:22:21 -07:00
samcake
9cf3dfd3f7 test this on windows ? 2015-07-28 15:49:39 -07:00
ZappoMan
c15161b71a fix crash in Particle Entities and pendingChanges.updateItem() 2015-07-28 14:56:38 -07:00
SamGondelman
e01cf1760b remove unused method 2015-07-28 14:27:31 -07:00
David Rowe
8f0663841c Provide more user-friendly eye tracking error messages 2015-07-28 14:09:19 -07:00
David Rowe
f0ed8d8cef Add menu item that enables / disables simulated eye tracking 2015-07-28 14:07:25 -07:00
Marcel Verhagen
34d63cdb43 Removed double "" 2015-07-28 22:02:36 +02:00
SamGondelman
482f064c64 Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-07-28 12:56:54 -07:00
SamGondelman
782a5c491e removed hand lasers because they had been renamed so they weren't removed 2015-07-28 12:56:31 -07:00
Bradley Austin Davis
6df260b3f9 Bad variable usage on OSX 2015-07-28 12:47:52 -07:00
Howard Stearns
4754615159 Fix NPC animations. 2015-07-28 12:34:10 -07:00
Brad Davis
2bb7a20578 Working on fullscreen targeting 2015-07-28 11:30:35 -07:00
Howard Stearns
e7516aab02 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-28 11:17:35 -07:00
David Rowe
72a590e34c Initialize, start, and stop eye tracking with simulated data 2015-07-28 11:02:56 -07:00
Sam Gateau
22e70ee691 merged master 2015-07-28 10:13:05 -07:00
Sam Gondelman
469696f283 Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-07-28 10:06:42 -07:00
Brad Davis
a049b14d13 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
43eec08514 Merge pull request #5376 from venkatn93/avatar 
New ambient occlusion effect in render pipeline
 2015-07-28 09:58:51 -07:00
David Rowe
8a7cdb1c64 Make Throttle FPS If Not Focus be enabled by default 2015-07-27 19:53:38 -07:00
SamGondelman
50f65b3a54 fixed controller mouse location in standing mode 2015-07-27 18:07:21 -07:00
Sam Gateau
baf7873ce1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-27 17:40:19 -07:00
Sam Gateau
66c5aec744 Remove commented dead code 2015-07-27 17:34:46 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -07:00
Niraj Venkat
34e400ac67 Changing var name to 'DebugAmbientOcclusion' 2015-07-27 17:14:09 -07:00
Seth Alves
6e5aca6da4 merge from upstream 2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4 add some javascript callable stuff back to MyAvatar 2015-07-27 16:42:54 -07:00
David Rowe
e0ca6eb5ed Add eye tracker class and menu item 2015-07-27 15:33:15 -07:00
Andrew Meadows
e527f49d65 removing interface dependency on ShapeCollider 2015-07-27 15:30:10 -07:00
Howard Stearns
1bb734aec0 Kill warnings. 2015-07-27 15:26:03 -07:00
Howard Stearns
064f2b471f Remove incorrectly-added file. 2015-07-27 14:29:44 -07:00
Sam Gateau
a5ad40bee9 INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked 2015-07-27 14:07:28 -07:00
Howard Stearns
80763b3fc5 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 13:45:25 -07:00
Howard Stearns
ef52c0703f Merge pull request #8 from AndrewMeadows/cadmium 
remove unused legacy Shapes from Model and friends
 2015-07-27 13:20:41 -07:00
Howard Stearns
8196770ed3 Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on. 2015-07-27 12:58:43 -07:00
Andrew Meadows
81831975b5 remove legacy CapsuleShape from SkeletonModel 2015-07-27 12:27:17 -07:00
Andrew Meadows
73ac941230 remove unused legacy Shapes from Model and friends 2015-07-27 11:15:33 -07:00
Sam Gondelman
b2e18b529b toggle overlay with mouse middle click, controller 'right click' 2015-07-27 10:09:59 -07:00
Stephen Birarda
d3c6d8b3cc move call to get VoxelPositionSize inside debug that uses it 2015-07-27 10:06:34 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
Stephen Birarda
615218c77d use a ref in stats unpacking 2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f fix OctreeSceneStat unpacking in Application 2015-07-27 09:53:27 -07:00
Bradley Austin Davis
2bdebb6def Trigger a build, and cleanup whitespace 2015-07-27 12:34:29 -04:00
Seth Alves
a3c6a4b9bc merge from upstream 2015-07-27 09:29:18 -07:00
Howard Stearns
185f6bef9f Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:21:41 -07:00
Howard Stearns
1ec0518d05 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:20:30 -07:00
Niraj Venkat
83e0856279 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-27 09:20:19 -07:00
Seth Alves
81375e47e0 remove methods from MyAvatar: setJointRotations setJointData clearJointData clearJointsData 2015-07-27 09:07:26 -07:00
Seth Alves
7e58283041 change the methods that aren't called from outside the class to be private 2015-07-27 08:54:08 -07:00
Seth Alves
8ac06c4059 remove friend class from Avatar 2015-07-27 08:48:16 -07:00
Seth Alves
73be57f54a Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-27 07:56:02 -07:00
Bradley Austin Davis
1338671537 Working on win32 and linux builds 2015-07-27 10:48:08 -04:00
Bradley Austin Davis
0cbc12af8b Merge remote-tracking branch 'upstream/master' into plugins 2015-07-27 10:15:10 -04:00
Bradley Austin Davis
3c6416d6b8 Merge branch 'master' into plugins 2015-07-27 10:09:02 -04:00
Brad Hefta-Gaub
a9d5723eb3 Merge pull request #5410 from kevinmthomas-carpool/20618 
CR for Job #20618 - Move Reload Content item to Developer menu.
 2015-07-26 21:54:55 -07:00
Seth Alves
ac53b6b22c Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-26 20:00:56 -07:00
Seth Alves
5abed29a43 merge from upstream 2015-07-25 21:15:57 -07:00
Seth Alves
24fff719c5 quiet compiler 2015-07-25 21:11:23 -07:00
Bradley Austin Davis
7edf138843 Attempting to fix offscreen UI event handling 2015-07-25 19:26:38 -04:00
Brad Davis
f66492b444 Merge pull request #5422 from ctrlaltdavid/20591 
CR for 20591 - Fix setting WebWindow's width and height
 2015-07-25 11:49:53 -04:00
Howard Stearns
8b5f24e4df Keep list of animations in Rig, not MyAvatar. 2015-07-24 22:02:39 -07:00
Sam Gondelman
f801471dd7 remove unnecessary line 2015-07-24 17:33:06 -07:00
Sam Gondelman
1af51572af fixed init crash if you follow very specific startup steps 2015-07-24 17:10:39 -07:00
Sam Gondelman
0e4d065cbc Merge remote-tracking branch 'upstream/plugins' into macPluginsFix 2015-07-24 16:52:16 -07:00
Philip Rosedale
e24395a226 Merge pull request #5383 from ctrlaltdavid/20630 
Improve looking-at-me indication
 2015-07-24 16:15:13 -07:00
Brad Davis
dc4ef8e648 Merge pull request #5426 from hyperlogic/ajt/vive-camera-fix 
paintGL camera change for Vive
 2015-07-24 18:43:34 -04:00
Stephen Birarda
82def6e15f resolve conflicts on merge with upstream/master 2015-07-24 15:40:35 -07:00
Sam Gondelman
07aed20280 paintGL camera change for Vive 
During rendering the application camera needs to be somewhere near where it's final position.
This is because it is used in several places, specifically it is used to determine if the camera is close
to the avatar's head, in order to hide it.
 2015-07-24 15:37:39 -07:00
Bradley Austin Davis
0efa2c0eee Merge remote-tracking branch 'upstream/master' into plugins 2015-07-24 17:33:24 -04:00
Howard Stearns
1663d095a1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-24 14:08:51 -07:00
Kevin M. Thomas
67c9a33cc0 Update Menu.cpp 2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b Merge branch 'master' of https://github.com/highfidelity/hifi into 20618 
# Conflicts:
#	interface/src/Menu.cpp
 2015-07-24 15:10:34 -04:00
Niraj Venkat
fc612ab8cd Merge conflict fix 2015-07-24 11:29:52 -07:00
Brad Davis
9727302d02 Merge pull request #5423 from hyperlogic/ajt/overlay-fade 
Update ApplicationCompositor to use QPropertyAnimation for alpha fades
 2015-07-24 14:28:32 -04:00
Anthony J. Thibault
c602346cad Update ApplicationCompositor to use QPropertyAnimation for alpha fades 2015-07-24 11:14:09 -07:00
Niraj Venkat
e036602726 Fixing merge conflicts 2015-07-24 11:08:40 -07:00
Bradley Austin Davis
975c95eded Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins 2015-07-24 13:59:11 -04:00
David Rowe
3893add148 Fix setting WebWindow's width and height 
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
 2015-07-24 10:43:24 -07:00
samcake
f3dc159e33 Merge pull request #5401 from ZappoMan/renderLaserPointers 
remove renderLaserPointers()
 2015-07-24 10:41:32 -07:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
Brad Hefta-Gaub
939638a3a8 Merge pull request #5414 from birarda/slow-events 
allow the QEvent queue in Application to get behind
 2015-07-24 10:10:42 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow 
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
 2015-07-24 13:09:07 -04:00
Andrew Meadows
1bf49d72f1 Merge branch 'rig' of github.com:howard-stearns/hifi into bromine 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-07-24 10:06:02 -07:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
Brad Davis
6899279d7d Merge pull request #5399 from ZappoMan/fixJSRayPick 
Fix JS calls to computePickRay() when mini-mirror is showing
 2015-07-24 11:46:07 -04:00
Seth Alves
bd1a661d01 Merge pull request #5416 from ctrlaltdavid/webwindow-title 
Add ability to update title of WebWindow after it's created
 2015-07-24 08:27:54 -07:00
Seth Alves
6841a47c4b Merge pull request #5412 from AndrewMeadows/bohrium 
decouple FPS from rotation rate during mouse drag
 2015-07-24 07:44:22 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
David Rowe
c1e1caa709 Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00
Anthony J. Thibault
87a0e48d30 Updates to overlay fade 
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
 2015-07-23 20:36:58 -07:00
samcake
8421aafe33 try to fix the scaling issues on mac 2015-07-23 18:17:10 -07:00
Stephen Birarda
cdcab299b6 bring back delayed queue of Application events 2015-07-23 18:00:35 -07:00
Philip Rosedale
a1544956e3 Merge pull request #5348 from ctrlaltdavid/20602 
DO NOT MERGE - QA for #20602 - Fix and improve eye saccades
 2015-07-23 17:42:24 -07:00
Andrew Meadows
2fc158246d decouple FPS from rotation rate during mouse drag 2015-07-23 17:30:50 -07:00
Anthony J. Thibault
1d93abf90c Overlay can be shown and hidden and has better behavior in Standing HMD Mode. 
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
 2015-07-23 17:17:03 -07:00
Stephen Birarda
407c9d2571 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-23 17:13:53 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Sam Gondelman
7c9189cfbe trying to fix init issue 2015-07-23 16:13:27 -07:00
Howard Stearns
16525dc737 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 15:41:00 -07:00
Andrew Meadows
f40feba36d Merge remote-tracking branch 'andrew/boron' into bromine 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
 2015-07-23 15:29:53 -07:00
Seth Alves
1e19e46aa6 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 15:14:19 -07:00
Seth Alves
33c97a1833 get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes 2015-07-23 15:14:10 -07:00
Ryan Huffman
0b2e896ea4 Add Asset-related types and packets 2015-07-23 15:13:56 -07:00
Bradley Austin Davis
901dd77f05 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-23 18:11:25 -04:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Ryan Huffman
52e422198b Add AssetScriptingInterface 2015-07-23 15:09:59 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Andrew Meadows
b26f4b0c8d fix for underdamped avatar rotation momentum 2015-07-23 14:49:15 -07:00
Bradley Austin Davis
00342d2c76 Fixing the avatar / HMD pose compisition for Oculus 2015-07-23 17:48:06 -04:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Seth Alves
4566d16402 move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected 2015-07-23 13:03:38 -07:00
Bradley Austin Davis
4ad72be0c7 Merge remote-tracking branch 'sam2/sam/input-plugins' into plugins 2015-07-23 15:40:22 -04:00
Bradley Austin Davis
96a52c4f02 Working on mac oculus functionality 2015-07-23 15:38:23 -04:00
Sam Gondelman
0bb3d5b5a0 disabled fullscreen, disabled sixense on mac temporarily 2015-07-23 11:51:36 -07:00
Sam Gondelman
4c6783a791 Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-07-23 11:46:07 -07:00
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -07:00
ZappoMan
720f6ec529 completely remove six sense lasers 2015-07-23 11:17:22 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval 
remove non-batch versions of GeometryCache renderXYZ() methods
 2015-07-23 11:11:35 -07:00
David Rowe
7c4f6b665b Use a default eye diameter for models without eyes, e.g., the masks 2015-07-23 11:04:58 -07:00
Bradley Austin Davis
40485948f9 Fixing merge boo-boos 2015-07-23 13:49:17 -04:00
ZappoMan
f4ec09a48b move renderLaserPointers() into a draw item 2015-07-23 10:42:22 -07:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
Niraj Venkat
9ccf316513 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-23 10:36:46 -07:00
Stephen Birarda
67ca8b2347 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-23 09:51:44 -07:00
Seth Alves
57eb798d63 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 09:46:41 -07:00
David Rowe
68254c1ff0 Merge branch 'master' into 20630 2015-07-23 09:46:20 -07:00
ZappoMan
3350d638dd always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror 2015-07-23 09:29:27 -07:00
Andrew Meadows
6657026a12 remove cruft: legacy shapes for skeleton bones 2015-07-23 08:34:44 -07:00
Brad Hefta-Gaub
e729a87328 Merge pull request #5393 from ctrlaltdavid/20632 
WL#20632 - Remove unused postLighting variable from code
 2015-07-23 08:24:09 -07:00
Brad Hefta-Gaub
a27a2f601b Merge pull request #5395 from huffman/fix-ray-picking 
Fix ray picking working intermittently
 2015-07-23 08:15:15 -07:00
ZappoMan
c2113ea96b remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
Ryan Huffman
198b6cfa88 Fix ray picking working intermittently 
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
    main camera. Application::_displayViewFrustum still gets updated to
    the current camera while rendering.
 2015-07-23 06:17:08 -07:00
Seth Alves
ee334ff826 JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates. 2015-07-22 18:43:10 -07:00
Stephen Birarda
7cee5f3ce5 don't reset the idleTimer if the interval hasn't changed 2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee force event processing up to a certain max time 2015-07-22 17:59:07 -07:00
David Rowe
11078d0d02 Get Developer > Avatar > Show Collision Bounding Shapes working again 
Note: Currently doesn't display well because alpha isn't working.
 2015-07-22 17:50:56 -07:00
David Rowe
3362358dcd Remove unused postLighting variable from Avatar and MyAvatar 
Fixes Leap and Hydra laser pointers not displaying.

Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
 2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb Remove dead code from Head 2015-07-22 17:50:54 -07:00
Stephen Birarda
785ae190ca add back send posted touch events 2015-07-22 17:49:27 -07:00
ZappoMan
71eeecc7f6 Revert "Instrument the inter-idle time and tweaking the timeout setting" 
This reverts commit 0c88972f09.
 2015-07-22 16:53:56 -07:00
SamGondelman
e27ba86f75 fixing merge issues with plugins 2015-07-22 14:57:59 -07:00
Ryan Huffman
9e2eb7fdbd Fix face-camera functionality for BillboardOverlay 2015-07-22 14:49:20 -07:00
Seth Alves
47965bc39c merge from upstream 2015-07-22 13:48:19 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -07:00
Marcel Verhagen
8f0893ba21 Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives. 
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.

So it now does not break existing content.

Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
 2015-07-22 22:34:45 +02:00
Howard Stearns
a6395a2351 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 12:29:27 -07:00
Howard Stearns
dbb4a8b767 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 11:40:25 -07:00
SamGondelman
505ef4c5cc set up sixense/vive menu items with correct event forwarding 2015-07-22 11:36:31 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Stephen Birarda
3fbda89f1d copy version in Packet move ctor/assignment 2015-07-22 11:17:50 -07:00
Anthony J. Thibault
700909d537 Fix for mirror rendering 
RenderArgs _renderMode was not getting set properly in
renderRearViewMirror().  Previously this was set in PaintGL but was lost
during display plugins refactor.
 2015-07-22 11:11:12 -07:00
Stephen Birarda
8363b0d522 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-22 11:06:53 -07:00
Bradley Austin Davis
68cf3776f0 Make stars a little smaller 2015-07-22 13:44:37 -04:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Niraj Venkat
adf7a1098d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-22 10:27:39 -07:00
Bradley Austin Davis
408bb082d7 Merge fixes, OSX compile fixes 2015-07-22 13:24:47 -04:00
David Rowe
9d33cfa965 Allow for look-at positions being not quite up to date as avatars move 
So that looking-at-me indicators don't flicker on when they shouldn't.
 2015-07-22 09:53:37 -07:00
David Rowe
e44cba500d Guard against head model not being available yet 2015-07-22 09:52:49 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
Bradley Austin Davis
2f13488f11 Fixing FBO bug on resizing windows 2015-07-22 11:28:36 -04:00
Brad Hefta-Gaub
4e04f0d887 Merge pull request #5381 from jherico/bart 
Fix deadlock when using textoverlay from main thread
 2015-07-22 07:59:35 -07:00
Brad Hefta-Gaub
2bd2004bda Merge pull request #5380 from jherico/maggie 
Restoring starfield size and color variation
 2015-07-22 07:58:15 -07:00
Bradley Austin Davis
65732d874c Merge branch 'maggie' into marge 2015-07-22 09:07:50 -04:00
Bradley Austin Davis
c0048afbec Merge branch 'bart' into marge 2015-07-22 09:07:45 -04:00
Bradley Austin Davis
190984657e Merge branch 'homer' into marge 2015-07-22 09:07:33 -04:00
Bradley Austin Davis
a93e17d622 Fix domain connection status border 2015-07-22 08:27:51 -04:00
Bradley Austin Davis
9596452c32 Trying to fix oculus rendering 2015-07-22 08:07:44 -04:00
Bradley Austin Davis
ae539afafb Fix deadlock when using textoverlay from main thread 2015-07-22 07:23:12 -04:00
David Rowe
87dbbdb2e8 Set an initial alpha in anticipation of sphere alpha working 2015-07-21 18:25:35 -07:00
David Rowe
55683e0cd5 Size looking-at-me eye spheres per avatar model dimensions 2015-07-21 18:24:47 -07:00
David Rowe
bed266dfe9 Fade looking-at-me eye spheres over half a second 2015-07-21 18:23:50 -07:00
David Rowe
9ac4e2f687 Render spheres over avatar eyes if they're looking at me 2015-07-21 18:22:27 -07:00
Bradley Austin Davis
bd5da87551 Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 19:23:38 -04:00
Bradley Austin Davis
d6994c6dfd Restoring star size and color variation 2015-07-21 19:22:10 -04:00
SamGondelman
e3bc4b3b89 working on plugin menu manipulation 2015-07-21 13:45:33 -07:00
Brad Hefta-Gaub
6dbe6bc375 Merge pull request #5332 from ctrlaltdavid/20612 
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
 2015-07-21 13:32:56 -07:00
Stephen Birarda
086e4efe44 verify packet versions at ice-server 2015-07-21 13:03:39 -07:00
Niraj Venkat
e0634de403 Turn on/off debug AO from menu item 2015-07-21 12:14:09 -07:00
Stephen Birarda
a61c04aa92 allow socket owner to specify unfiltered packets 2015-07-21 12:00:16 -07:00
Sam Gateau
7b35048e52 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3 Removing the gl driver version report intiialization code out of applciation 2015-07-21 11:17:41 -07:00
Seth Alves
fecdc08720 merge from upstream 2015-07-21 09:53:51 -07:00
Seth Alves
cdc26526b4 merge from upstream 2015-07-21 09:51:16 -07:00
Philip Rosedale
cf88bce082 Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering 
Fix Avatar > Blue Sphere While Speaking not rendering
 2015-07-21 09:11:36 -07:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8 Merge pull request #5371 from Atlante45/smart_pointers 
Smart pointers fixes
 2015-07-21 08:52:29 -07:00
Brad Davis
5b63863dca Merge pull request #5378 from ZappoMan/warningFixes 
coding standard fix
 2015-07-21 08:52:17 -07:00
David Rowe
716211c6b7 Merge branch 'master' into fix-speech-bubble-not-rendering 2015-07-21 08:45:13 -07:00
ZappoMan
558f10640b coding standard fix 2015-07-21 08:30:33 -07:00
Brad Davis
6d4c7cd4f2 Merge pull request #5374 from ZappoMan/warningFixes 
Warning fixes and removing dead code
 2015-07-21 07:23:40 -07:00
Brad Davis
9fd80d7954 Working on batch 2015-07-20 19:21:29 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Seth Alves
abfe60aa20 whenever Model class uses _jointState, use the Rig version if there is a Rig. 2015-07-20 18:31:42 -07:00
Brad Davis
51973674f5 Merge remote-tracking branch 'upstream/master' into marge 2015-07-20 17:26:36 -07:00
Brad Davis
c3a2b72c13 Breaking framebuffer ops out of texture cache 2015-07-20 17:26:26 -07:00
David Rowe
ac4b64c853 Merge branch 'master' into 20602 2015-07-20 17:14:52 -07:00
Sam Gateau
5bf85961d2 removing dead code 2015-07-20 17:13:02 -07:00
Sam Gateau
ad1771c738 removing dead code 2015-07-20 17:09:11 -07:00
Brad Davis
94d57a2e43 fixing missing glew init 2015-07-20 16:51:01 -07:00
Sam Gateau
9d9142c274 cleaning commented code supposedly dead now 2015-07-20 16:50:24 -07:00
SamGondelman
d985d0293a correcting comments, removing dead code + back slash 2015-07-20 16:48:53 -07:00
Sam Gateau
6a0ca6e113 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-20 16:22:12 -07:00
Stephen Birarda
9fb8b55359 repairs to early return for sendNackPackets 2015-07-20 16:10:11 -07:00
ZappoMan
65a79cfefb fix a bunch of warnings 2015-07-20 15:58:25 -07:00
Sam Gateau
b5090883a0 merge with latest network pr 2015-07-20 15:49:10 -07:00
David Rowe
a488a12151 Merge branch 'master' into 20602 2015-07-20 15:37:43 -07:00
Sam Gateau
59666f664a merging my changes to remove cruff from application to AUstin;s latest 2015-07-20 15:37:17 -07:00
Anthony J. Thibault
17220542d8 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 
Conflicts:
	examples/example/games/sword.js
 2015-07-20 15:22:19 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -07:00
Niraj Venkat
eaf75c01b9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.h
 2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
 2015-07-20 14:53:19 -07:00
SamGondelman
4d3b08b5e3 modified sword.js to work with vive controllers 2015-07-20 14:52:49 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Brad Davis
c0859ffd4c Removing some dead forward declarations 2015-07-20 14:33:10 -07:00
Andrew Meadows
7578a70c4c Merge pull request #5359 from birarda/protocol 
Network Protocol Refactor
 2015-07-20 14:30:58 -07:00
Brad Davis
9fafc920ee Merge branch 'homer' into plugins 
Conflicts:
	interface/src/Application.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
 2015-07-20 13:53:15 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
488a449cb1 Merge branch 'master' into homer 2015-07-20 13:34:21 -07:00
Brad Davis
359abd6474 Merge branch 'master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/GLCanvas.cpp
	interface/src/GLCanvas.h
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
	libraries/render-utils/src/OffscreenGlCanvas.cpp
	libraries/render-utils/src/OffscreenGlCanvas.h
	libraries/render-utils/src/text/EffectType.h
 2015-07-20 13:33:24 -07:00
Stephen Birarda
462ff97722 remove FlowLayout.cpp that was accidentally kept 2015-07-20 13:06:31 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Sam Gateau
1a9f6e12a5 something not compiling but just before merge with upstream 2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub
c41e20b90f Merge pull request #5366 from jherico/marge 
Naked GL removal work
 2015-07-20 12:12:22 -07:00
Brad Davis
3d09e772f9 Merge branch 'marge' into homer 2015-07-20 12:09:51 -07:00
ericrius1
e75a6feafe can toggle hit effect on and off from a script 2015-07-20 11:58:26 -07:00
Brad Davis
23b058e4eb Removing starfield tilt and reducing grid alpha 2015-07-20 11:40:12 -07:00
Seth Alves
2814ad78fe Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-20 11:16:11 -07:00
Howard Stearns
9623ccf792 Change instantiation of Rig. 2015-07-20 11:07:25 -07:00
Brad Davis
dcaaeec593 Removing AO effect (temporarily) and wireframe mode 2015-07-20 10:55:11 -07:00
SamGondelman
d88e484b00 hand information is in correct coordinate space, cleanup 2015-07-20 10:44:27 -07:00
Atlante45
fc2956342e Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 10:39:16 -07:00
David Rowe
73ffe5d9f6 Fix Avatar > Blue Sphere While Speaking not rendering 2015-07-20 10:25:59 -07:00
Brad Davis
de92e66635 Removing shadows code 2015-07-20 09:59:22 -07:00
Seth Alves
9af104f745 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-20 09:47:23 -07:00
Brad Davis
d4e637c5b8 Removing superfluous lighting and naked GL in mirror 2015-07-20 09:36:05 -07:00
Stephen Birarda
6b11495a20 resolve conflicts on merge with upstream master 2015-07-20 08:51:48 -07:00
Brad Davis
5159452335 Fixing invalid vector usage and strange picking crash 2015-07-19 23:03:46 -07:00
Brad Davis
4c3cfe1e82 Starfield jazz hands 2015-07-19 20:53:50 -07:00
Brad Davis
81543d9185 Removing unneeded undef 2015-07-19 19:06:21 -07:00
Brad Davis
f13152b2b4 Fixing reference to PI/2 2015-07-18 23:04:16 -07:00
Brad Davis
0da8b27fcf Removing unused files 2015-07-18 22:53:43 -07:00
Brad Davis
5b494c23fd More header cleanup 2015-07-18 22:38:26 -07:00
Brad Davis
35f7307f30 More header cleanup 2015-07-18 22:15:50 -07:00
Brad Davis
0056208565 Another whack at GL headers 2015-07-18 17:04:44 -07:00
Brad Davis
c446bb307d Adding convenience return *this to many transform methods 2015-07-18 16:56:32 -07:00
Brad Davis
e4f6586c3c Working on star rendering, removal of naked GL 2015-07-18 16:40:54 -07:00
Philip Rosedale
61c2b172d4 Merge pull request #5357 from ctrlaltdavid/scriptable-muting 
Mute / un-mute face tracking when menu item is changed from script
 2015-07-18 15:45:01 -07:00
David Rowe
47fdbedfb2 Fix FPS throttle default 2015-07-18 15:22:47 -07:00
David Rowe
7b11d02eb2 Default Throttle FPS to disabled 2015-07-18 14:18:08 -07:00
David Rowe
d0489bf2a0 Add menu item, Developer > Render > Throttle FPS If Not Focus 2015-07-18 14:18:06 -07:00
Brad Davis
b7fdfd8663 Working on lighting 2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Sam Gateau
a0590182ad Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-17 17:44:54 -07:00
ZappoMan
98c078d995 move audio scope to the back 2015-07-17 17:44:29 -07:00
Sam Gateau
96e18af77b trying to remove the naked gl calls aroiund the rearViewMirror 2015-07-17 17:44:25 -07:00
ZappoMan
ecab2538d7 quick hack to fix overlay ordering 2015-07-17 17:27:15 -07:00
Anthony J. Thibault
01c740f415 cleaning up plugin architecture, fixed hand controllers 2015-07-17 17:19:49 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b Merge pull request #5349 from jherico/marge 
Working on text rendering overlays
 2015-07-17 16:47:48 -07:00
Niraj Venkat
0580c8477e 3-step groundwork for AO in the pipeline 2015-07-17 16:42:03 -07:00
ZappoMan
eb989fd725 fix the backround colors for text overlays, pending austins PR to really fix them 2015-07-17 16:38:05 -07:00
ZappoMan
695470b1c1 fix audio scope 2015-07-17 16:30:10 -07:00
ZappoMan
8692f51399 dead code cleanup 2015-07-17 16:15:02 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Stephen Birarda
54edc6f993 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-07-17 16:04:45 -07:00
ZappoMan
c20c6e4b90 fix retina in an Austin approved manner 2015-07-17 16:01:32 -07:00
ZappoMan
03a44a1c80 fix retina 2015-07-17 15:45:42 -07:00
Atlante45
e3f7c33767 Fix index check in setJointRotation 2015-07-17 15:39:25 -07:00
ZappoMan
ccd2f98a76 one more try 2015-07-17 15:28:25 -07:00
Atlante45
3f4041595a Fix compile error in connect 2015-07-17 15:26:04 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
Seth Alves
18197314c5 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-17 14:55:06 -07:00
Seth Alves
d287817829 give SkeletonModel created by MyAvatar a Rig pointer 2015-07-17 14:52:37 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog 
Added a dialog box to display Audio Network Statistics
 2015-07-17 14:45:51 -07:00
Bradley Austin Davis
3bfa8aae0b Removing debug output 2015-07-17 14:34:24 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Brad Davis
6f998e5d28 Working on line spacing on mac 2015-07-17 13:32:31 -07:00
Seth Alves
bcd6b30ec3 move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists 2015-07-17 13:31:48 -07:00
ZappoMan
4dadf60724 some tweaks from Sam 2015-07-17 12:50:20 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
David Rowe
550e9224c5 Mute / un-mute face tracking when menu item is changed from script 2015-07-17 11:45:15 -07:00
ZappoMan
33464dfd6c cleanup dead code 2015-07-17 11:35:42 -07:00
Stephen Birarda
7a13c867ae quit the ScriptEngine thread once the script is done 2015-07-17 11:18:14 -07:00
Anthony J. Thibault
5fe4d06562 fixed input devices menu exclusivity 2015-07-17 11:11:31 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -07:00
Brad Davis
ea74aac1d6 Working on cleaning up diff 2015-07-17 11:02:32 -07:00
bwent
b22fd3f4a0 fixed lagging issues 2015-07-17 10:58:30 -07:00
Ryan Huffman
68564a79b0 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-17 09:59:05 -07:00
ZappoMan
efa2001325 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 09:25:37 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Brad Davis
7f6bb552a3 Working on cleaning up diff 2015-07-16 20:51:37 -07:00
Anthony J. Thibault
65b76869fa Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-16 18:47:55 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Anthony J. Thibault
060f6c19a6 almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly 2015-07-16 18:16:59 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
Brad Davis
7e32bfb85e Fixing mac/linux build 2015-07-16 17:35:05 -07:00
Atlante45
ceea5143e1 Avoid string copy 2015-07-16 16:55:37 -07:00
Atlante45
6ce710f237 Fix domain request denied reason read 2015-07-16 16:47:09 -07:00
ZappoMan
410e0a99ad hacking on more naked GL 2015-07-16 16:45:58 -07:00
Brad Davis
ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-16 16:37:55 -07:00
ZappoMan
069620b2d9 hacking on more naked GL 2015-07-16 16:36:48 -07:00
ZappoMan
09430b6596 hacking on more naked GL 2015-07-16 16:27:41 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Stephen Birarda
eb0ed438ec remove environment data packet 2015-07-16 16:23:57 -07:00
Anthony J. Thibault
157c20e57b goToLocation should work properly in standing HMD mode 2015-07-16 16:04:08 -07:00
Anthony J. Thibault
ef0a157111 Fixes for oculus rift support 
* should work in standing and 'seated' mode
* OculusBaseDisplayPlugin getModelView now only applies eye offset to match behavior from the OpenVRPlugin
 2015-07-16 16:04:08 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
David Rowe
f5b02c1731 Remove dead code 
Camera mode cannot be mirror
 2015-07-16 14:06:42 -07:00
David Rowe
6c6e3eb758 Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
David Rowe
9980233a0d Use estimated eye pitch and yaw from DDE to deflect eyes 2015-07-16 13:03:33 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
David Rowe
228e8d4fc0 Velocity filter eye pitch and yaw 2015-07-16 12:37:47 -07:00
bwent
854a098180 keep track of channel id's within addChannel function, pass in when updating 2015-07-16 12:28:43 -07:00
Stephen Birarda
3d6b246782 check version against version in OPP 2015-07-16 12:18:27 -07:00
Stephen Birarda
61f23f6a5e Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-16 11:56:26 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
David Rowe
6b523ada2b Calculate eye pitch and yaw from DDE coefficients 2015-07-16 10:48:21 -07:00
Seth Alves
75a35f9fcf Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-16 09:49:25 -07:00
Anthony J. Thibault
ce80bff7cb Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-15 18:50:52 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
David Rowe
ba733f730b Move towards saccade target at speed taking into account frame rate 2015-07-15 18:05:10 -07:00
David Rowe
8336b318e1 Scale saccade per target distance when calculating eye rotation 
So that saccades still show when looking into distance.
 2015-07-15 18:05:09 -07:00
Anthony J. Thibault
7a3f53910f fix compile error, oops 2015-07-15 17:50:47 -07:00
Anthony J. Thibault
442b701c9a refactor of myAvatar sensor matrix updating 
Much simpler and maintanable.

* updateFromHMDSensorMatrix is called at start of Application::update()
  It moves the avatar forward taking into account head motion in the room.
* all other avatar manipulation call setPosition and setOrientation
  normally
* Then at the end of Application::update() updateSensorToWorldMatrix is
  called.  This ensures that rendering will use the correct camera
  position w.r.t. the body.
 2015-07-15 17:38:12 -07:00
bwent
4c70c197e6 keep track of channel index with global variable 2015-07-15 17:19:57 -07:00
samcake
b7ac84e174 Merge pull request #5342 from ZappoMan/removeNakeGL 
remove some more dead code and naked gl
 2015-07-15 17:07:55 -07:00
Howard Stearns
b87ed7dc18 Remove dead code. 2015-07-15 17:05:57 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix 
Hydra hand and mouse fixes
 2015-07-15 19:03:04 -05:00
Kevin M. Thomas
671263909a Moved reload content item to nested Network menu item. 2015-07-15 19:47:37 -04:00
bwent
0654bb5e36 Pass by reference into initialize and update function, remove dead code 2015-07-15 16:40:55 -07:00
ZappoMan
d5a6e87a02 remove naked gl from Avatar::calculateDisplayNameTransform() 2015-07-15 16:34:23 -07:00
Kevin M. Thomas
b93ae7b527 Move reload content item to developer menu. 2015-07-15 19:25:18 -04:00
Stephen Birarda
6a02e6d001 resolve final conflict in Application 2015-07-15 16:23:23 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
bwent
c159068701 Make pointers member variables 2015-07-15 16:10:41 -07:00
Howard Stearns
6ca458b624 Instantiated in MyAvatar 2015-07-15 15:59:24 -07:00
ZappoMan
7795eaace6 remove more naked gl 2015-07-15 15:56:27 -07:00
ZappoMan
d1e511efcb more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl 2015-07-15 15:52:12 -07:00
Atlante45
8aa2892fde Remove OctreePacketProcessor dtor 2015-07-15 15:35:13 -07:00
ZappoMan
2ad2c4d554 remove some dead code 2015-07-15 15:33:28 -07:00
Brad Hefta-Gaub
7d8f2e906b Merge pull request #5340 from cozza13/20617 
CR for Job #20617 - Change default Minimum Desktop FPS
 2015-07-15 14:59:43 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub
ae6e7f05b6 Merge pull request #5341 from samcake/daft 
Remove the glGet( viewport ) from DeferredLightingEffect
 2015-07-15 14:26:08 -07:00
Niraj Venkat
0ee916fb6f Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-15 14:10:42 -07:00
Niraj Venkat
1b13f837bd Porting AO to new pipeline 2015-07-15 14:10:17 -07:00
Atlante45
039bdc8900 Check dependencyManager return value 2015-07-15 14:06:39 -07:00
ZappoMan
849b584596 more GlowEctomy 2015-07-15 13:16:38 -07:00
Chris Collins
ff288fdd5d While we work on FPS I have decreased the default LOD FPS 
While we work on FPS I have decreased the default LOD FPS. In a new
users preferences this will now show as 15 desktop and 30 HMD.
 2015-07-15 13:09:55 -07:00
Atlante45
aa517adb73 Fix Application inheritance formatting 2015-07-15 13:09:34 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
2c24251b52 Clean up from previous commit 2015-07-15 11:41:26 -07:00
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00
ZappoMan
6b06987700 remove dead code for magnifier 2015-07-15 10:48:07 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Anthony J. Thibault
fb62fda2d2 started working on input plugin architecture 2015-07-15 10:26:48 -07:00
ZappoMan
0eeddddd6b removed naked GL from drawOnHUD overlays. 2015-07-15 09:46:58 -07:00
ZappoMan
53c3e3d731 fix CR feedback 2015-07-15 09:03:07 -07:00
David Rowe
fc0ae17a87 Mirror head when using face tracker in fullscreen mirror 
Mirror translation, yaw, and roll in the same manner as done for HMD
case, to mimic what you would expect to see in a mirror.
 2015-07-15 07:27:55 -07:00
David Rowe
0af62ca946 Convert tabs to spaces 2015-07-15 07:27:54 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
samcake
c9112966ba revert debug code 2015-07-14 22:00:32 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
ZappoMan
5d43c98ebc fix image overlays to not use Naked GL 2015-07-14 20:56:36 -07:00
ZappoMan
8bb6616a25 remove nakedGL from skeleton IK constraint rendering 2015-07-14 18:47:35 -07:00
Sam Gateau
98a3141e11 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-14 18:38:21 -07:00
Anthony J. Thibault
9363ca2f97 Fix for camera matrix position when in Vive HMD. 2015-07-14 18:36:42 -07:00
Sam Gateau
440464f884 Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile 2015-07-14 18:35:11 -07:00
ZappoMan
5a927c4c90 remove dead code 2015-07-14 18:25:50 -07:00
Sam Gondelman
6a0df442f9 emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc) 2015-07-14 17:59:59 -07:00
ZappoMan
f1b85aefa9 more dead code removal: NodeBounds 2015-07-14 17:59:20 -07:00
Sam Gondelman
f3cb25065f can't move when hydras at base, hands can deactivate individually 2015-07-14 17:36:22 -07:00
ZappoMan
23b89a6f7d remove naked gl/dead code from line and cube overlays 2015-07-14 17:04:07 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Philip Rosedale
17ec524253 Merge pull request #5324 from ZappoMan/fixLaggingTouch 
fix lagging touch events
 2015-07-14 16:28:00 -07:00
Ryan Huffman
c6ffda12f9 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:21:57 -07:00
Stephen Birarda
e596733c8b fix for stats grab from iterator 2015-07-14 16:21:34 -07:00
Ryan Huffman
ede9217483 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:15:01 -07:00
Stephen Birarda
e4849d29ec re-use iterator when checking _octreeServerSceneStats 2015-07-14 16:14:43 -07:00
ZappoMan
68f4fe6566 fix lagging touch events 2015-07-14 16:03:44 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
bbe5a3d682 remove commented out call to resetCounters 2015-07-14 15:51:32 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Philip Rosedale
221a92eeee Merge pull request #5322 from ctrlaltdavid/fix-eye-direction 
Fix eye directions so that they're correct when avatar leans backwards
 2015-07-14 15:38:56 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
677ffb7068 Remove redundant lookup for packetType 2015-07-14 14:50:36 -07:00
Stephen Birarda
e2188415fe fix ref to qApp, connection to audioIO 2015-07-14 14:45:26 -07:00
Stephen Birarda
4dd3dd6386 swap m for comma in Menu 2015-07-14 14:44:04 -07:00
Stephen Birarda
23548a99bc move NACK packet disabling to EntityEditPacketSender 2015-07-14 14:43:01 -07:00
Stephen Birarda
8d4c945874 cleanup audioIO connections in Application 2015-07-14 14:34:39 -07:00
Stephen Birarda
1f4ac0f17c emit mutedByMixer signal for a noisy mute 2015-07-14 14:30:46 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
David Rowe
bfad3ee02a Fix eye directions so that they're correct when avatar leans backwards 2015-07-14 14:07:32 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Anthony J. Thibault
aa66691a73 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-14 12:37:09 -07:00
Atlante45
a32f54da2f Cleanup 2015-07-14 12:36:18 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Anthony J. Thibault
9209e0745e Added "Standing HMD Sensor Mode" checkbox to menu 
removed static bool isRoomTracking and instead moved into the View menu.
 2015-07-14 12:12:38 -07:00
Brad Hefta-Gaub
049419cec7 Merge pull request #5307 from howard-stearns/remove-octreeFades 
Remove old octreeFade code that wasn't working anyway
 2015-07-14 10:24:01 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar 
Avatars rendered correctly based on Scene.shouldRenderAvatars
 2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
Niraj Venkat
1f1a5f8e75 Coding standard and fixing pointers 2015-07-13 22:57:11 -07:00
Philip Rosedale
c81053fc83 Merge pull request #5318 from samcake/punk 
Fixing the ImageOverlay Bug
 2015-07-13 22:25:46 -07:00
Anthony J. Thibault
158c1c6aa8 Removed some debugging prints and drawing 2015-07-13 20:41:19 -07:00
Brad Davis
f8144e4ee2 Merge branch 'master' into plugins 2015-07-13 19:52:53 -07:00
Brad Davis
fee5f7cd0f Merge fixes 2015-07-13 19:07:44 -07:00
Clément Brisset
a432752c39 Merge pull request #5316 from ctrlaltdavid/20604 
QA for #20604 - Add an "is looking at me" indicator above avatars' heads
 2015-07-13 16:40:11 -07:00
Sam Gateau
f08c608195 Remove dead code 2015-07-13 16:33:04 -07:00
Sam Gateau
5555ccd225 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80 Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js 2015-07-13 16:18:39 -07:00
Clément Brisset
c99382ee74 Merge pull request #5287 from ctrlaltdavid/20607 
CR for Job #20607 - Interface upgrade message has bad formatting
 2015-07-13 16:07:17 -07:00
Clément Brisset
24eb4c8263 Merge pull request #5309 from sethalves/quiet-compiler 
quiet compiler
 2015-07-13 15:55:35 -07:00
Stephen Birarda
34f9b1881e fix registration of OctreePacketProcessor for set of types 2015-07-13 15:40:55 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Niraj Venkat
10e0a93ac0 Fix for avatar rendering not working on domain exit/entry 2015-07-13 15:22:00 -07:00
David Rowe
59f456a2f2 Add an "is looking at me" indicator above avatars' heads 
Menu item: Developer > Avatar > Show Who's Looking at Me
 2015-07-13 14:16:39 -07:00
Anthony J. Thibault
454aa9b983 Optimization for computation of sensorMat 
During setPosition/setOrientation we used the cached inverse of the body
matrix, instead of the somewhat convoluted previous code path.
 2015-07-13 14:01:12 -07:00
Anthony J. Thibault
57731e7bd8 More refactoring of MyAvatar HMD Sensor math. 
Moved compuation of avatar postion using head/body joints int a helper
method.  Also we compute this once per frame in setHMDSensorMatrix instead
of inside of every setPostion/setOrientation call.
 2015-07-13 13:36:55 -07:00
Stephen Birarda
ca1ff9b0f5 fix a couple of compile errors for avatar changes 2015-07-13 13:34:36 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Anthony J. Thibault
d07a02cef3 Refactor of MyAvatar and Application HMD sensor 
MyAvatar now uses a cached copy of the HMDSensor location,
instead of calling into Application for every access.
This allows us to simplify application to always return the
most recent pose, instead of a different one pre and post physics.

Added accessors to HMD Sensor in MyAvatar, besides being helpful,
it also an optimization to avoid extracting quaternions from the
HMD matrix on every access.
 2015-07-13 12:56:33 -07:00
Brad Davis
9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
 2015-07-13 12:54:19 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Stephen Birarda
f3d5b8f7c6 add a missing semicolon 2015-07-13 11:18:20 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Howard Stearns
d1952583ab Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades 2015-07-13 07:24:08 -07:00
Seth Alves
fb23eb0faf Merge pull request #5301 from samcake/yellow 
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
 2015-07-12 11:36:03 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de fix activation of object when action changes 2015-07-10 18:45:40 -07:00
Anthony J. Thibault
ac9e1384c0 controllers render in right position, wrong rotation 2015-07-10 18:27:12 -07:00
Anthony J. Thibault
94918be949 another fix for viewing vive user in third person 2015-07-10 18:27:12 -07:00
Stephen Birarda
ffcd8e1613 update connection for packet version mismatch 2015-07-10 17:54:51 -07:00
Stephen Birarda
9ee62a8a38 fix for connection denied packet in Application 2015-07-10 17:52:51 -07:00
Niraj Venkat
f95bd3f7bd Fixing build error 2015-07-10 17:46:20 -07:00
Niraj Venkat
bbd7b2a65e Removed unused functions 2015-07-10 17:31:49 -07:00
Niraj Venkat
dacc6f66c0 Avatars rendered correctly based on Scene.shouldRenderAvatars 2015-07-10 17:26:56 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0 Move and rename menu item 2015-07-10 15:47:46 -07:00
Atlante45
a3848f08d2 Conditionnal fixes. 2015-07-10 15:36:17 -07:00
Sam Gateau
98f10e72ec fix the wrong function name that happened missing a merge 2015-07-10 15:20:49 -07:00
Ryan Huffman
dee117500b Remove process() from OctreePacketProcessor 2015-07-10 15:00:46 -07:00
Ryan Huffman
99aaefbd03 Fix and update signature of Application::handleDomainConnectionDeniedPacket 2015-07-10 15:00:29 -07:00
Ryan Huffman
6e53a5ad97 Update OctreePacketProcessor to use SharedNodePointer 2015-07-10 14:23:09 -07:00
Andrew Meadows
9cb7e86877 cleanup of AvatarActionHold deserialization 2015-07-10 12:34:12 -07:00
Atlante45
5cfa1605df Made Texture safe with resource refresh 2015-07-10 12:28:06 -07:00
Sam Gateau
2c05349b06 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
Atlante45
4702b39130 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-10 10:56:11 -07:00
Andrew Meadows
1759f0553d Merge pull request #5290 from BingShearer/CrashFixes 
Crash fixes
 2015-07-10 10:42:47 -07:00
Anthony J. Thibault
c69665e0fe fix for goToLocation 2015-07-10 09:43:33 -07:00
Anthony J. Thibault
51e24ea466 head model follows HMD for observers 2015-07-10 09:20:38 -07:00
Ryan Huffman
78ff6477bd Update OctreePacketProcessor to use QSharedPointer<NLPacket> 2015-07-10 08:45:21 -07:00
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub
af20969eb9 Merge pull request #5298 from jherico/lisa 
Restore audio scope
 2015-07-09 19:03:29 -07:00
Anthony J. Thibault
653b0d7789 started working on rendering controllers 2015-07-09 19:03:11 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Brad Davis
a92a7980d7 Restore audio scope 2015-07-09 17:49:25 -07:00
Andrew Meadows
270ea7af9e Merge pull request #5292 from sethalves/palm-rotation 
action changes to allow "hold" action to track palm rotation
 2015-07-09 17:44:28 -07:00
Niraj Venkat
007d662db1 Re-added for shouldRenderEntities 2015-07-09 17:40:14 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Seth Alves
d0d0b2a143 Merge pull request #5295 from birarda/master 
potential fix for windows domain connect cycling
 2015-07-09 17:04:06 -07:00
Atlante45
bfeb095fb4 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-09 16:30:56 -07:00
Anthony J. Thibault
b6c0ae4bea Fix for flying in HMDMode with avatar collisons disabled 2015-07-09 16:29:43 -07:00
Niraj Venkat
adf5b95835 Changing formatting 2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d Fixing merge 2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Brad Davis
214405a0e5 Fixing typo 2015-07-09 16:06:27 -07:00
Ryan Huffman
2380fb23c3 Update OctreePacketProcessor to use NLPacket& 2015-07-09 16:05:52 -07:00
Stephen Birarda
efb89c281f fix creation of QTimer parented by NodeList 2015-07-09 16:02:29 -07:00
Stephen Birarda
a4f1145f06 fix QTimer connection to nodeList 2015-07-09 16:01:41 -07:00
Stephen Birarda
408ecb9735 move domain server check in timer to node thread 2015-07-09 15:59:32 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Ryan Huffman
6f9907a22d Stub in process() for OctreePacketProcessor 2015-07-09 15:31:45 -07:00
Ryan Huffman
8da50d342c Remove DatagramProcessor.h from Application 2015-07-09 15:31:01 -07:00
Ryan Huffman
5e65f422fa Move mute environment handling to Application 2015-07-09 15:30:25 -07:00
Bing Shearer
99c563602f Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist. 2015-07-09 15:25:37 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Seth Alves
5312beeaf4 if an action changes its own arguments, cause reserialisation 2015-07-09 14:50:31 -07:00
Seth Alves
a01fb6f1dc if an action changes its own arguments, cause reserialisation 2015-07-09 14:32:34 -07:00
Bing Shearer
85f6fdb8cf Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample) 2015-07-09 14:20:10 -07:00
Bing Shearer
25708678f6 Fixed shutdown procedure for Datagrams so that there is no crash on exit 2015-07-09 14:18:53 -07:00
Ryan Huffman
dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets 
Conflicts:
	interface/src/DatagramProcessor.cpp
	interface/src/octree/OctreePacketProcessor.cpp
	libraries/entities/src/EntityEditPacketSender.cpp
	libraries/networking/src/LimitedNodeList.h
	libraries/networking/src/NLPacket.h
 2015-07-09 14:08:35 -07:00
Stephen Birarda
1b4e333c49 Merge pull request #3 from birarda/atp 
initial networking API changes for new protocol
 2015-07-09 16:51:37 -04:00
Seth Alves
050c472d6a Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation 2015-07-09 13:39:37 -07:00
Brad Hefta-Gaub
489a8b4b3d Merge pull request #5285 from jherico/homer 
Move log file writing to a separate thread
 2015-07-09 12:22:13 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Stephen Birarda
a363f42bb2 pass const NLPacket& for all sendUnreliablePacket calls 2015-07-09 11:42:18 -07:00
Seth Alves
08d63b7fd8 first attempt at palm rotation 2015-07-09 11:03:02 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Brad Davis
2fff560ff9 Fixing log file viewer 2015-07-09 09:54:35 -07:00
Ryan Huffman
3b7ad982a4 Update OctreePacketProcessor to use packet callbacks 2015-07-09 09:23:50 -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
Stephen Birarda
19c5f0b67c resolve conflicts on merge with upstream/master 2015-07-08 22:54:36 -07:00
Brad Davis
63dfd570f1 Adding priority support to GenericThread 2015-07-08 22:54:31 -07:00
Stephen Birarda
8c2cf2cf25 fix an unused variable warning 2015-07-08 22:48:44 -07:00
Brad Davis
08d1364f81 Move file log persistence to a separate thread 2015-07-08 22:35:23 -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
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Stephen Birarda
658ad6bd02 fix eachNode lambda in Application 2015-07-08 18:55:26 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Stephen Birarda
cf15cbc62f fix a cast, move a packet 2015-07-08 18:37:25 -07:00
Stephen Birarda
c5840d085c replace packet header size check with 0 2015-07-08 18:35:56 -07:00
Stephen Birarda
dfa5be1a0c fix for killPacket in MyAvatar and DatagramProcessor header check 2015-07-08 18:35:04 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded 
Optimize ByteCountCoded<> to not do extra heap allocations
 2015-07-08 18:35:02 -07:00
Stephen Birarda
dc7c268467 fixes for changed API in Application 2015-07-08 18:27:10 -07:00
Stephen Birarda
9c18277e9c packet fixes in script-engine and Application 2015-07-08 18:24:49 -07:00
Atlante45
ee3a8b1b6e Clear resource caches instead of restarting 2015-07-08 18:23:16 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Seth Alves
7bea4a54a3 Merge pull request #5274 from AndrewMeadows/argon 
cleanup of EntityActionInterface and friends
 2015-07-08 17:54:52 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Anthony J. Thibault
0f30da64bc added Plugin interface to ViveControllerManager 
mostly I just added this to add the isSupported method, so it wouldn't
attempt to initialize if there was no HMD attached.
 2015-07-08 16:31:52 -07:00
Ryan Huffman
1b5d526444 Add new packet processing to AvatarManager 2015-07-08 15:06:50 -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
Sam Gondelman
64118d9118 started moving hydra to use UserInputMapper::Poses, needs testing 2015-07-08 13:38:48 -07:00
Ryan Huffman
c365ea60ad Add packet listening to AvatarManager 2015-07-08 13:13:21 -07:00
Anthony J. Thibault
07141fd1e3 rotation and thrust work in both 2d and hmd mode 
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
 2015-07-08 12:25:57 -07:00
Atlante45
ed296850e2 Rename to clear cache and restart 2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3 Clear cache and restart first draft 2015-07-08 12:23:22 -07:00
Ryan Huffman
0b0446e527 Add handleComainConnectionDeniedPacket to Application 2015-07-08 11:54:22 -07:00
Ryan Huffman
b960d86f80 Remove datagramProcessor from Application 2015-07-08 11:54:06 -07:00
Philip Rosedale
574758eae9 Merge pull request #5252 from ctrlaltdavid/20601 
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
 2015-07-08 11:37:40 -07:00
Stephen Birarda
122fd61451 fix a bad replacement in DatagramProcessor 2015-07-08 10:44:40 -07:00
Stephen Birarda
818521864b fix missed bad PacketType replacement 2015-07-08 10:27:32 -07:00
Ryan Huffman
9d25612ff8 Move DatagramProcessor to PacketProcessor 2015-07-08 10:24:30 -07:00
Ryan Huffman
e89dbe8541 Update PacketType in DatagramProcessor 2015-07-08 10:24:30 -07:00
Ryan Huffman
b1c09d71f7 Add packet listeners to DatagramProcessor 2015-07-08 10:21:15 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Anthony J. Thibault
754e55553a modified rotation in MyAvatar::updatePosition, reenabled trackpad input 2015-07-07 17:29:46 -07:00
Anthony J. Thibault
15cf008f13 hand controllers and arrow keys now work 2015-07-07 17:29:45 -07:00
David Rowe
abc54f2e3f Polished fonts, colors, etc. 2015-07-07 17:08:02 -07:00
Stephen Birarda
6c6143f21e remove NetworkPacket and replace with NodePacketPair 2015-07-07 16:56:05 -07:00
David Rowe
b123e280d6 Add release numbers to associated text 2015-07-07 16:22:01 -07:00
Stephen Birarda
1f68ad892a replace PacketList usage with NLPacketList 2015-07-07 16:14:57 -07:00
Stephen Birarda
11d5aa9803 fix queryPacket initialization in Application 2015-07-07 15:41:07 -07:00
Stephen Birarda
56880e8858 return fixes for NAK PacketLists 2015-07-07 15:33:03 -07:00
Stephen Birarda
45b549398d use PacketList for application nack packets 2015-07-07 15:31:58 -07:00
Anthony J. Thibault
4f8cf0af8c moved sdl2manager to input-plugins 2015-07-07 15:24:39 -07:00
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Atlante45
9889dcdd64 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 12:29:00 -07:00
Howard Stearns
1c2972bd7c Expose avatar collisions to scripts, and include velocityChange in exposed collision data. 2015-07-07 11:49:55 -07:00
Stephen Birarda
e05470a11c change to new packet sending in Application 2015-07-07 11:11:20 -07:00
Brad Davis
a04921e74b Merge branch 'master' into plugins 2015-07-07 11:10:51 -07:00
Anthony J. Thibault
5293effc2e more work in progress vive room tracking 
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
 2015-07-07 00:12:48 -07:00
Atlante45
2ba6bd3afc Double display name offset 2015-07-06 18:39:43 -07:00
Anthony J. Thibault
834b75f4c4 work in progress room scale tracking work. 
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
 2015-07-06 18:25:42 -07:00
Atlante45
687f9dda4a Restore old offset behaviors 2015-07-06 18:21:17 -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 Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Brad Davis
bd938d5f4c Merge pull request #5263 from ZappoMan/inBoundStats 
Additional inbound entity stats
 2015-07-06 17:12:19 -07:00
Brad Davis
95000eec3c Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-06 16:22:03 -07:00
ZappoMan
05f28064bf add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
Atlante45
4a777f600f Change DDE Packet struct name to avoid collision 2015-07-06 15:11:36 -07:00
Sam Gateau
fe633cd545 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-06 15:04:02 -07:00
David Rowe
5046f4c1ac Update upgrade dialog 
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
 2015-07-06 13:19:42 -07:00
Brad Davis
21562c0766 Merge pull request #5258 from ericrius1/nakedGLStripping 
Removing naked GL calls from overlay code
 2015-07-06 10:25:50 -07:00
Atlante45
85df510b4b Use depth bias to avoid z-fighting on text3d overlays 2015-07-04 18:40:37 -07:00
Atlante45
9bf6c439aa Use depth bias to avoid z-fighting on display name 2015-07-04 18:34:19 -07:00
Atlante45
32cf4dac78 Fix displayname z-fighting 2015-07-04 16:06:38 -07:00
ZappoMan
74733452da some tweaks to make stats dialog more readable 2015-07-04 11:25:27 -07:00
ZappoMan
40cdd8646e add packets per second to octree processing stats 2015-07-03 15:53:53 -07:00
David Rowe
3f38a835d8 Fix look-at vectors not rendering if not looking at me 2015-07-03 13:49:10 -07:00
Eric Levin
3d06b011aa adding batch to renderHUD 2015-07-03 13:27:00 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Eric Levin
9d3995ae25 Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping 2015-07-03 09:42:19 -07:00
Brad Davis
ba7c3a2c27 Attempting to get UI and navigation keys/mouse working 2015-07-03 07:10:33 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Brad Davis
ed5835ff05 Trying to get mac display plugins working: 2015-07-02 22:29:22 -07:00
Bradley Austin Davis
0034a14fc1 Working on mac functionality 2015-07-02 18:14:12 -07:00
Stephen Birarda
a9420d4212 replace controlled broadcast to nodes in Application 2015-07-02 17:55:26 -07:00
Sam Gondelman
3f6fbd058c merge with standing-mode, hands relative to neck 2015-07-02 17:44:19 -07:00
ZappoMan
a54cf67064 add stats for processing time per packet 2015-07-02 17:28:53 -07:00
ZappoMan
8916dd2056 add stats for elements and entities per second 2015-07-02 17:00:35 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
ZappoMan
0c0b8dbbc1 add stats for elements and entities per incoming packet 2015-07-02 16:19:13 -07:00
David Rowe
87ca7626d7 Merge branch 'master' into 20601 2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716 Adjust gaze target for someone looking at me 2015-07-02 15:43:23 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
ZappoMan
b568e895ec Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-02 15:00:09 -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
ericrius1
8be1fd28e5 stripping naked gl calls from overlays to allow vive and oculus plugins to work 2015-07-02 13:57:00 -07:00
David Rowe
3a92878544 Reinstate making someone looking at me look at my camera instead of face 2015-07-02 13:47:52 -07:00
ZappoMan
5c4d4893de added bytes per edit stats 2015-07-02 13:44:28 -07:00
ZappoMan
63b585da0f added updates per second stat 2015-07-02 13:28:12 -07:00
Brad Hefta-Gaub
b11172affb Merge pull request #5254 from jherico/timing_menu_log 
Inhibiting log spam unless a menu item is selected
 2015-07-02 12:48:01 -07:00
Brad Davis
d5fe6f0bdb Inhibiting log spam unless a menu item is selected 2015-07-02 12:34:32 -07:00
Philip Rosedale
fba569d7db Merge pull request #5218 from huffman/fix-hmd-displayname-orientation 
Fix avatar displayname to point towards camera
 2015-07-02 12:19:40 -07:00
ZappoMan
b13a4b2a71 add edit update stats 2015-07-02 11:07:47 -07:00
ericrius1
ad97b28734 fixed merge conflicts 2015-07-02 11:01:40 -07:00
Clément Brisset
b616fff222 Merge pull request #5220 from howard-stearns/avatar-collision-sounds 
Avatar collision sounds
 2015-07-02 10:27:24 -07:00
Sam Gondelman
81efd99ae4 merge with hifi/plugins 2015-07-02 10:13:28 -07:00
David Rowe
c20cd40275 Merge branch 'master' into 20601 
Conflicts:
	interface/src/avatar/Head.cpp
 2015-07-02 09:51:47 -07:00
Anthony J. Thibault
f0d8916d8a First crack at room scale tracking from vive HMD. 
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
 2015-07-02 09:47:08 -07:00
Philip Rosedale
0905962d90 Merge pull request #5251 from ctrlaltdavid/20600 
Fix Show Eye Focus and Show Look-at Vectors
 2015-07-02 09:16:20 -07:00
Brad Hefta-Gaub
f16b8d5083 Merge pull request #5246 from jherico/inter_idle_timing 
Instrument the inter-idle time and tweaking the timeout setting
 2015-07-02 09:01:44 -07:00
Howard Stearns
1f3a1f6ac8 Add comments re upcoming physics changes. 2015-07-02 10:07:14 -05:00
Howard Stearns
d0675c7f22 Side-effect new value before emit. 2015-07-02 09:56:02 -05:00
Bradley Austin Davis
54bbc841e2 Working on mac compilability 2015-07-01 23:03:33 -07:00
David Rowe
925fd71262 Fix rendering of look-at vectors 2015-07-01 22:45:47 -07:00
David Rowe
0df9ebeda3 Fix rendering of look-at avatar sphere 
postLighting is never true.
 2015-07-01 22:45:13 -07:00
David Rowe
026f6d3690 Add mouth as third gaze target in addition to left and right eyes 2015-07-01 21:22:30 -07:00
David Rowe
4ced0dc6c4 Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw 2015-07-01 20:24:47 -07:00
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
David Rowe
26cbb14f45 Alternative look-at gaze left/right with face trackers too 
Instead of looking at one or other eye depending on look direction.
 2015-07-01 20:09:36 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Atlante45
ee13407066 Fix smart pointer casts 2015-07-01 19:22:40 -07:00
Sam Gondelman
0333adb95b moved controllers to input-plugins, they work now 2015-07-01 18:46:57 -07:00
David Rowe
fada70fe02 Remove redundant code 2015-07-01 18:32:33 -07:00
David Rowe
bc4c635106 Fix gazing at avatar (when no head tracking or HMD) 
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
 2015-07-01 18:31:16 -07:00
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -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
Brad Davis
88a733181e Fixing comment to reflect code 2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01 CR comments and fixing the microsecond display 2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29 Merge pull request #5247 from ericrius1/handRender 
Fixed broken rendering of hydra visualization paraphernalia
 2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09 Instrument the inter-idle time and tweaking the timeout setting 2015-07-01 16:14:17 -07:00
ericrius1
a24df5c02f added postLighting check back for rendering avatar Hands 2015-07-01 15:28:48 -07:00
ericrius1
f49f368ec3 removed dead commented out code 2015-07-01 15:16:34 -07:00
ericrius1
8129d0eb1f hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00