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
Seth Alves
66f595f4b2
Merge pull request #5520 from howard-stearns/single-animation-vs-blend
...
Don't let individual startAnimation get messed up by blend/fade.
2015-08-06 18:55:14 -07:00
Sam Gateau
e4ce1002ea
cleaning th ecode
2015-08-06 18:54:58 -07:00
Zander Otavka
6e8c154c42
Undo registering PropertyBinding as a meta type.
2015-08-06 18:54:08 -07:00
Sam Gateau
561a058dc8
cleaning th ecode
2015-08-06 18:53:21 -07:00
Sam Gateau
f0f141a2b4
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-06 18:51:44 -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
Brad Davis
8188d34037
Merge pull request #5518 from SamGondelman/sam/input-plugins
...
Working on toybox script
2015-08-06 16:09:22 -07:00
Zander Otavka
13a63a5a3d
Improve mouse click logic in scripts.
...
Also restore behavior of controlPanel.js being hidden on startup.
2015-08-06 16:04:11 -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
Brad Hefta-Gaub
0947bf2cd0
Merge pull request #5517 from samcake/punk
...
Improving the quality of the normal encoding in the Deferred Buffer
2015-08-06 15:13:08 -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
samcake
db7e457325
Merge pull request #5521 from huffman/fix-billboard-backface
...
Disable back-face culling when rendering BillboardOverlay
2015-08-06 14:14:16 -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
Howard Stearns
02f57286e4
Don't let individual startAnimation get messed up by blend/fade.
2015-08-06 11:30:18 -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
bwent
ffccc9ca96
clean up formatting, make connectionUUID const in NodeList
2015-08-06 10:11:22 -07:00
bwent
73ea958640
add check if user is local user
2015-08-06 09:01:25 -07:00
Seiji Emery
ba8a15b893
Added primitives (geometryCache)
2015-08-05 20:02:22 -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
Brad Davis
37dc2d00cd
Merge pull request #5515 from sethalves/zlib-in-build-instructions
...
update build instructions -- interface now depends on zlib
2015-08-05 19:10:42 -07:00
Sam Gondelman
3256e30f02
toybox script
2015-08-05 18:54:08 -07:00
bwent
a8f9f9d746
clean-up formatting
2015-08-05 17:43:03 -07:00
samcake
07a9dd3404
Ready for release
2015-08-05 17:41:23 -07:00
Sam Gateau
7be736d6de
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-08-05 17:17:30 -07:00
Sam Gateau
95682e6270
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-05 17:17:00 -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
Seth Alves
12286b7e9b
Merge pull request #5514 from howard-stearns/only-update-motion-state-for-my-avatar
...
Don't try to animate other people's avatars!
2015-08-05 16:17:22 -07:00
Seth Alves
bee21b13b7
interface now depends on zlib. describe how to install on windows
2015-08-05 16:13:25 -07:00
