wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -07:00
Brad Hefta-Gaub
2a4e6a1311
Merge pull request #3001 from Barnold1953/OculusOverlay
...
Simple raypicking for scripts with oculus rift.
2014-06-09 13:21:24 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
barnold1953
936f04cece
Simple raypicking for scripts with oculus rift.
2014-06-09 11:55:29 -07:00
Andrzej Kapolka
28490f9bbc
Merge pull request #2994 from AndrewMeadows/ragdoll
...
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
2014-06-09 11:55:19 -07:00
Andrew Meadows
4f9da0cc37
fix whitespace formatting
2014-06-09 11:50:31 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
Stojce Slavkovski
939f8c49de
return balance in satoshis
2014-06-08 15:55:16 +02:00
Stojce Slavkovski
b3279e03ca
references fix
2014-06-07 23:27:51 +02:00
Stojce Slavkovski
8de2bdfb99
expose account details via AccountScriptingInterface
2014-06-07 23:17:49 +02:00
Stojce Slavkovski
6365f6b857
Extend TextOverlay to accept font size
...
Fix TextRenderer color rendering
2014-06-07 22:24:35 +02:00
Stojce Slavkovski
9810335adf
Merge branch 'master' of https://github.com/worklist/hifi into 19755
2014-06-07 10:33:41 +02:00
Stojce Slavkovski
fea1433ced
Add initial mybalance script
2014-06-07 10:32:36 +02:00
wangyix
5286090812
removed interface print statements
2014-06-06 17:52:48 -07:00
wangyix
b39559d860
packet recovery seems to be working
...
Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7
added write lock/unlock
...
...for _octreeSceneStatsLock
2014-06-06 14:33:53 -07:00
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
Stephen Birarda
b6b148cd9f
resolve conflicts on merge with upstream master
2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7
fix input loudness for a stereo source
2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6
complete piping of stereo audio through mixer
2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6
tweak resample to handle 48 to 24 stereo, add stereo/mono byte
2014-06-06 10:27:59 -07:00
Stephen Birarda
7da091d2b4
initial hooks for stereo audio
2014-06-06 10:15:09 -07:00
Andrew Meadows
7f25c3e011
merge upstream/master into andrew/ragdoll
2014-06-06 08:53:37 -07:00
Andrew Meadows
551029c2f5
slave SkeletonModel's collision shapes to RagDoll
2014-06-06 08:51:22 -07:00
Andrew Meadows
c689d826f4
fix for broken windows build with PrioVR libs
...
The Model API changed but this code path was not updated.
2014-06-05 15:48:18 -07:00
Clément Brisset
02452819c3
Merge pull request #2988 from AndrewMeadows/ragdoll
...
RagDoll Part 1: basic data structure
2014-06-05 14:44:36 -07:00
Andrzej Kapolka
8d908a12a3
Fix build.
2014-06-05 12:28:02 -07:00
barnold1953
f0f7d0c55f
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-05 12:17:09 -07:00
Andrew Meadows
4eb801b8e9
merge upstream/master into andrew/ragdoll
2014-06-05 11:32:18 -07:00
Andrew Meadows
1b2cd2e144
adding RagDoll scaffold
2014-06-05 11:07:35 -07:00
barnold1953
4e699c0f84
Fixed coding standard and build error
2014-06-05 10:34:06 -07:00
Andrzej Kapolka
47c71e2d3a
Merge pull request #2983 from PhilipRosedale/master
...
Added squeezeHands.js for open/close hand animation with controller trigger
2014-06-04 17:35:43 -07:00
barnold1953
84cd200617
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
2014-06-04 17:33:04 -07:00
barnold1953
e60c671c05
Switched Oculus UI to hemisphere. Added curved semicircle UI
2014-06-04 17:24:20 -07:00
Philip Rosedale
864db25f4f
remove unused variables causing warning
2014-06-04 15:43:33 -07:00
Andrew Meadows
7807388b08
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-04 14:28:23 -07:00
Andrew Meadows
e1cb88471f
add a comment
2014-06-04 14:19:45 -07:00
Andrew Meadows
f19b562e88
add JointState::setRotation(rotModelFrame)
2014-06-04 14:17:39 -07:00
Andrew Meadows
212ac13802
setRotation -> setJointRotationFromBindFrame
2014-06-04 14:10:28 -07:00
Andrew Meadows
323fa70cf3
remove last of "InModelFrame" qualifiers
2014-06-04 14:03:29 -07:00
Andrew Meadows
ccfd620c84
setJointPositionInModelFrame -> setJointPosition
2014-06-04 13:56:37 -07:00
Andrew Meadows
3af4b1b333
getJointPositionInModelFrame -> getJointPosition
2014-06-04 13:51:43 -07:00
Andrew Meadows
971268d4f2
setRotationInModelFrame -> setRotation
2014-06-04 13:46:08 -07:00
Andrew Meadows
b3cabb8156
applyRotationDeltaInModelFrame -> applyRotationDelta
2014-06-04 13:43:15 -07:00
Andrew Meadows
d8f5e10947
getPositionInModelFrame -> getPosition
2014-06-04 13:36:54 -07:00
Andrew Meadows
4a3fbfcdee
getRotationInModelFrame -> getRotation
2014-06-04 13:34:58 -07:00
Andrew Meadows
4ae58153e0
computeTransformInModelFrame -> computeTransform
2014-06-04 13:31:31 -07:00
Andrew Meadows
d32e14ca04
renames of JointState data members
2014-06-04 13:27:28 -07:00
Andrew Meadows
b1b7f6bdc4
remove last world-frame transfoms from JointState
2014-06-04 12:03:01 -07:00
Andrew Meadows
d46a90d763
remove JointState::_combinedRotation
...
instead use JointState::_rotationInModelFrame
2014-06-04 11:56:20 -07:00
Andrew Meadows
19f0f453a5
remove JointState::setRotation()
...
instead use JointState::setRotationInModelFrame()
2014-06-04 11:52:07 -07:00
Andrzej Kapolka
f6395435cf
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-04 11:51:11 -07:00
Andrzej Kapolka
74afcf5626
Allow floating point start/end frames and negative play speeds.
2014-06-04 11:47:53 -07:00
Andrew Meadows
5d8e3d447a
remove JointState::getRota/PositionInWorldFrame()
...
instead: use getRotat/PositionInModelFrame() and do math
2014-06-04 11:36:00 -07:00
wangyix
25e2f28b02
more cleanup
2014-06-04 11:30:35 -07:00
Andrew Meadows
729c01ddbf
remove more getHybridTransform() calls
2014-06-04 11:25:38 -07:00
wangyix
b452d08495
cleaned up debug statements
...
also reorganized MovingPercentile a little bit
2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1
changed MovingMedian to MovingPercentile
2014-06-04 10:59:32 -07:00
Andrew Meadows
30d936c15b
getJointPosition -> getJointPositionInWorldFrame
2014-06-04 10:52:10 -07:00
Andrew Meadows
14e782e439
remove some JointState::getHybridTransform() calls
2014-06-04 10:42:04 -07:00
Andrew Meadows
d3f51fe38e
FinalOrientation -> FinalOrientationInWorldFrame
2014-06-04 10:41:17 -07:00
Andrew Meadows
aea517af46
fix for partial hand restore after hydra inactive
2014-06-04 10:19:27 -07:00
barnold1953
edf5d5bda1
Fixed bug that disabled cursor for windows
2014-06-04 08:38:01 -07:00
wangyix
50746a6540
extra commit of previous commit?
2014-06-03 16:19:12 -07:00
barnold1953
d4fd1e9515
Stopped Oculus UI from glowing.
2014-06-03 16:01:47 -07:00
Andrew Meadows
a1afcfd42c
remove JointState::applyRotationDelta()
...
(use JointState::applyRotationDeltaInModelFrame()) instead)
2014-06-03 15:57:16 -07:00
Andrew Meadows
7f46e9d514
remove JointState::getJointRotation()
...
(use getRotationModelFrame() instead)
2014-06-03 15:42:38 -07:00
barnold1953
036bdf5d07
Removed pointless 1.0f
2014-06-03 15:26:12 -07:00
barnold1953
611c68d0d8
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
2014-06-03 15:23:58 -07:00
barnold1953
d1b7882c6f
Mouse input and magnification for Oculus Overlay
2014-06-03 15:23:17 -07:00
Andrew Meadows
e7f32c211b
remove world-frame hand/palm set methods
2014-06-03 14:48:57 -07:00
Andrew Meadows
05af993262
Add more model-frame methods
2014-06-03 14:24:04 -07:00
Andrew Meadows
03bf1fe69d
Add joint manipulations in model-frame
2014-06-03 14:04:09 -07:00
Brad Hefta-Gaub
03f0ff111f
Merge pull request #2976 from talentraspel/19751
...
dynamically malloc/free arrays to avoid stack overflow on windows.
2014-06-03 12:10:44 -07:00
Kai Ludwig
23b56bf174
start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows.
...
this fixes restarted servers not getting properly recognized by the interface - at least on windows.
2014-06-03 20:10:55 +02:00
barnold1953
75bee69ef8
Fixed coding standard
2014-06-03 10:49:54 -07:00
Andrew Meadows
f99489c157
rolling back previous change for IK instability
2014-06-03 10:40:30 -07:00
Kai Ludwig
162939fda1
dynamically malloc/free arrays to avoid stack overflow on windows.
...
starting with 0 for array index will give a reasonable value for 'first'.
2014-06-03 19:11:53 +02:00
Brad Hefta-Gaub
6061330826
Merge pull request #2973 from matsukaze/master
...
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
2014-06-02 22:41:02 -07:00
barnold1953
f4391bcdbe
_distance variable
2014-06-02 17:23:32 -07:00
barnold1953
10d0b6af03
Fixed Oculus overlay color bug
2014-06-02 16:47:51 -07:00
barnold1953
4ed03e996a
Added Oculus Options menu
2014-06-02 16:15:51 -07:00
barnold1953
90754e320d
Curved Oculus overlay around camera as a semicircle
2014-06-02 16:05:07 -07:00
Andrew Meadows
d7be5faa9d
unravel rotation code by giving proper names
...
The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
2014-06-02 14:43:25 -07:00
Andrew Meadows
9b3773fa3b
remove 'fromBind' argument to getJointRotation()
2014-06-02 14:20:13 -07:00
Brad Hefta-Gaub
6f5d2ba233
Merge pull request #2970 from Barnold1953/master
...
Mirror mode fix, particleBirds.js
2014-06-02 13:02:05 -07:00
Andrew Meadows
a62a270004
merge andrew/inertia into andrew/ragdoll
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/renderer/Model.h
2014-06-02 11:56:27 -07:00
Andrew Meadows
9e60b758df
Made JointState transforms private.
...
Also changed some function names to be more descriptive.
Using "Hybrid" to describe frame with world-rotation + model-local-origin.
2014-06-02 11:34:59 -07:00
Andrew Meadows
8e7daed2b3
Merge upsrtream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-02 11:32:23 -07:00
barnold1953
863e2c56ae
Fixed mirror mode for non-headless models.
2014-06-02 10:41:10 -07:00
matsukaze
46d45a2d43
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
...
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.
Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
2014-06-02 05:55:58 -04:00
ZappoMan
8b51cd0d8a
fix bug in Menu::removeAction() where we weren't removing the action key from the hash, memory leak, and other problems
2014-05-31 14:04:33 -07:00
ZappoMan
22a8f88195
add support for Menu.menuExists() and menu.menuItemExists()
2014-05-31 13:24:07 -07:00
Andrzej Kapolka
70afda6f86
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-30 15:19:34 -07:00
Stephen Birarda
d48a5dd305
don't force OAuthWebViewHandler to stay on top
2014-05-30 14:54:25 -07:00
Andrzej Kapolka
164192fb50
If the skeleton doesn't have eye joints (as with the Fuse models), make up
...
some positions based on the head and neck joints.
2014-05-30 11:03:46 -07:00
Andrew Meadows
4eb4334ed8
replace Model::setJointRotation() with JointState::setRotation()
2014-05-30 09:57:32 -07:00
Andrew Meadows
557d7d428b
minor rename and formatting
2014-05-30 08:28:15 -07:00
Andrew Meadows
e21dbd8726
rename updateWorldTransforms to computeTransforms
2014-05-30 08:20:11 -07:00
Andrzej Kapolka
b93b009cd8
Merge pull request #2953 from PhilipRosedale/master
...
Fixes having large yaw movements get head and body out of alignment with oculus
2014-05-29 19:00:37 -07:00
AndrewMeadows
5b74829318
Merge pull request #2955 from ey6es/cascade
...
Basic cascaded shadow maps for increased shadow draw distance.
2014-05-29 18:57:44 -07:00
Andrzej Kapolka
f42199b3e1
Merge pull request #2952 from Atlante45/click_drag_attach
...
Click drag attach!
2014-05-29 18:55:33 -07:00
AndrewMeadows
eed2cd28ef
Merge pull request #2956 from ZappoMan/perfstats
...
Fix Ray Intersection bug that was causing low FPS... also added more performance debugging
2014-05-29 18:48:38 -07:00
Atlante45
17e3bd6110
CR comments
2014-05-29 18:24:21 -07:00
Andrzej Kapolka
1eace78e47
Hide distances; they no longer need to be publicly visible.
2014-05-29 17:46:25 -07:00
ZappoMan
ac22cebde1
more performance stats debugging
2014-05-29 17:41:40 -07:00
Andrzej Kapolka
34091128d8
Distance tweak.
2014-05-29 17:22:59 -07:00
Andrzej Kapolka
67921c474e
Merge branch 'master' of https://github.com/highfidelity/hifi into cascade
2014-05-29 17:09:09 -07:00
Andrzej Kapolka
12beef7fec
Apply the new shadow distances to the models, too.
2014-05-29 17:08:36 -07:00
Philip Rosedale
d17eeaf35b
remove old oculus yaw offset, expand limit on head yaw
2014-05-29 16:50:13 -07:00
Andrzej Kapolka
0b4484a153
Trying a different way of determining the cascade threshold distances.
2014-05-29 16:49:51 -07:00
Andrew Meadows
6efa851104
minor cleanup + use 'fraction' instead of 'percent'
2014-05-29 15:44:27 -07:00
Atlante45
73f7390eaa
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
2014-05-29 15:37:22 -07:00
Clément Brisset
6864fc3b99
Merge pull request #2951 from ZappoMan/perfstats
...
add improved detailed rendering and FPS debugging stats
2014-05-29 15:37:07 -07:00
ZappoMan
7e3ef34e6c
CR feedback
2014-05-29 15:34:20 -07:00
Andrzej Kapolka
391902f79b
Cascaded shadow maps for models.
2014-05-29 15:30:40 -07:00
Atlante45
0eb56000ef
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
2014-05-29 15:02:21 -07:00
Clément Brisset
21d1a18bd5
Merge pull request #2949 from AndrewMeadows/inertia
...
safe copy of JointState data
2014-05-29 14:44:05 -07:00
Brad Hefta-Gaub
2c8da2bda7
Merge pull request #2950 from wangyix/flighttime_fix_pull
...
Fix for unreasonable flight times
2014-05-29 14:43:15 -07:00
Atlante45
9c38beb4bc
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
2014-05-29 14:34:18 -07:00
Atlante45
b91fd19f39
snapped attachment to center and scale them to fit
2014-05-29 14:30:28 -07:00
Andrew Meadows
603333f634
add JointState::restoreRotation()
2014-05-29 14:11:17 -07:00
Andrew Meadows
2e99d316ac
remove JointState::_translation
...
(use corresponding data in FBXJoint instead)
2014-05-29 12:52:05 -07:00
Andrzej Kapolka
09231f01f3
Retain "simple" shadows, supply cascaded as option.
2014-05-29 12:48:41 -07:00
ZappoMan
e6966c2155
add improved detailed rendering and FPS debugging stats
2014-05-29 12:12:23 -07:00
Andrew Meadows
a898fcbf75
move details of getJointRotation() into JointState
...
also: remove unused getLeft/RightHandRotation() methods
2014-05-29 11:43:25 -07:00
wangyix
c87c474877
removed debug info, cleaned code for pull req
2014-05-29 10:39:40 -07:00
Atlante45
37613f086b
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
...
Conflicts:
interface/src/renderer/Model.cpp
2014-05-29 10:28:09 -07:00
Mohammed Nafees
2c3784c7d5
Merge branch master of upstream
2014-05-29 22:31:32 +05:30
Andrew Meadows
4cf5628783
move applyRotationDelta() from Model to JointState
2014-05-29 10:00:55 -07:00
wangyix
a0f9d2c106
Merge remote-tracking branch 'upstream/master'
2014-05-29 09:20:30 -07:00
Andrew Meadows
29e093e2e0
fix float literals to agree with coding standard
2014-05-29 09:20:01 -07:00
AndrewMeadows
b849c07faf
Merge pull request #2945 from huffman/19725
...
Code Review for Job #19725
2014-05-29 09:06:43 -07:00
AndrewMeadows
31237003db
Merge pull request #2944 from Barnold1953/master
...
Disable oculus overlay until it is curved.
2014-05-29 09:01:52 -07:00
AndrewMeadows
21f045ebe0
Merge pull request #2939 from huffman/19648
...
Code Review for Job #19648
2014-05-29 08:53:31 -07:00
Ryan Huffman
425632e072
Add 'f' to end of const float to follow coding standard
2014-05-29 08:48:22 -07:00
Andrew Meadows
86d6fd45de
safe copy of JointState data
2014-05-29 08:19:43 -07:00
Andrzej Kapolka
ff77644caa
Progress on selecting cascades.
2014-05-28 18:35:30 -07:00
Andrew Meadows
ec25982a58
add JointState::updateWorldTransform()
2014-05-28 17:51:17 -07:00
wangyix
5d4b0df108
added flag,seq,st to EnvironmentData, untested
...
removed/commented out debug prints
2014-05-28 17:41:38 -07:00
Andrew Meadows
b15b0fd96c
cleaner initialization of JointState
2014-05-28 17:31:07 -07:00
wangyix
c799077379
added flag,seq,ts to ParticleErase and ModelErase
...
... this fixes unreasonable flight-time issue
2014-05-28 17:20:10 -07:00
barnold1953
81ed0d99f7
Added prediction for Oculus rift to reduce apparent latency.
2014-05-28 17:13:59 -07:00
Andrew Meadows
9f2a4ae626
Make JointState a proper class
...
JointState gets a pointer to its corresponding FBXJoint
2014-05-28 16:49:39 -07:00
Atlante45
b4deed775e
Added joints position and combined rotation to scripting interface
2014-05-28 15:59:42 -07:00
Andrzej Kapolka
698ecbf9c5
Fix for shadow map rendering.
2014-05-28 15:58:45 -07:00
