Commit graph

704 commits

Author SHA1 Message Date
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset()
for improved walk animations
2014-10-05 19:10:55 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
2014-10-03 16:55:58 -07:00
Atlante45
56acc86f4f Missed some qints 2014-09-30 21:20:37 -07:00
Atlante45
68c25e805a Switch int64 to int 2014-09-30 14:31:40 -07:00
Atlante45
5f95cbc101 JS hooks 2014-09-30 11:23:33 -07:00
Atlante45
1afdd34577 Added custom audio offset and volume to Player 2014-09-30 11:23:25 -07:00
Atlante45
c99047677f Members initialisation 2014-09-29 14:49:55 -07:00
Atlante45
6d15728283 frame interpolation for recordings 2014-09-29 12:30:10 -07:00
Atlante45
cf453a8953 removed _isPaused 2014-09-25 19:32:57 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master
Improved eye contact, audio driven mouth and brows, linear audio scope
2014-09-25 09:32:37 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
Atlante45
11e60c864a Changed recording file format 2014-09-24 15:17:23 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
Atlante45
f536e33d13 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-23 14:54:49 -07:00
Atlante45
7ab8c7750c Extra spaces 2014-09-23 14:37:43 -07:00
Atlante45
3b33db9a6b Added pause/setCurrentTime/setCurrentFrame JShooks 2014-09-23 14:19:16 -07:00
Atlante45
95c00b1d4e Added pause behavior + change frame computation 2014-09-23 14:18:54 -07:00
Atlante45
13a5dbf489 Added frame computation and JS hooks 2014-09-23 11:01:21 -07:00
Andrew Meadows
ab53202003 remove warning about signed/unsigned comparison 2014-09-23 09:07:05 -07:00
Atlante45
8393fcc6eb Frame computation + timerOffset member
When jumping inside a recording
2014-09-22 14:01:02 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Atlante45
29ff8c09d9 Fix LookAtPosition 2014-09-18 15:23:58 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Atlante45
72d8522adc Fixed typo + removed MesageBoxes 2014-09-18 10:45:12 -07:00
Atlante45
397be962f4 CR fixes 2014-09-18 10:37:36 -07:00
Stephen Birarda
c9c8a1c194 handle another casing issue for Nodelist include 2014-09-18 10:11:34 -07:00
Stephen Birarda
6d335a8634 fix capitalization in NodeList include 2014-09-18 10:02:54 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Atlante45
e0739e4aa8 PreCR fixes 2014-09-18 00:03:02 -07:00
Atlante45
06dd9d0376 Moved Player and Recording to their own files 2014-09-17 23:52:21 -07:00
Atlante45
d27134a7ac Added getters for the different Player options 2014-09-17 17:06:47 -07:00
Atlante45
34c16b8a74 Convert .rec to new format if necessary 2014-09-17 16:25:48 -07:00
Atlante45
6e55c66d09 Fix radix bug 2014-09-17 16:24:54 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Atlante45
c699726ae8 Fixed URLs not read properly 2014-09-16 16:32:14 -07:00
Atlante45
81fc0d3696 Added options to use recording context 2014-09-16 14:50:20 -07:00
Atlante45
f649cd1a6e Changed how looping occurs in recordings 2014-09-16 14:49:47 -07:00
Atlante45
96995e3aed Enforce checksums equality 2014-09-16 13:59:30 -07:00
Atlante45
1c5c9cb31b Fix bug adding first samples twice 2014-09-16 13:57:46 -07:00
Atlante45
72481999df Compute actual checksum 2014-09-16 12:46:42 -07:00
Atlante45
8573130f07 Write correct Offset ad Length of the data 2014-09-16 12:34:22 -07:00
Atlante45
59637390a2 Add global timestamp to recordings 2014-09-16 12:26:55 -07:00
Atlante45
f5b53a77ab Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-16 12:14:11 -07:00
Atlante45
d80a42b800 New recording file format
Added header containing:
		- Magic number
		- Version number
		- Data Offset
		- Data Length
		- CRC-32
	Planned space for metadata
	Added context block (domain, models, transform, display name,
attachments)
	Improved glm types packing (SHould take about half the space it
used to))
2014-09-15 19:19:10 -07:00
Atlante45
ffba243a4f Added methods to read/write glm types 2014-09-15 19:17:16 -07:00
Atlante45
b28e7e4562 Added RecordingContext support to Player/Recorder
Changed meaning of certain values stored in recordings
2014-09-15 19:14:47 -07:00
Atlante45
29f85ecca4 Introduced RecordingContext class 2014-09-15 19:09:40 -07:00
Atlante45
8f65f036dd Remove deprecated getters 2014-09-15 19:06:09 -07:00
Atlante45
145e11a478 Move one-line method to .h
Moved method to .h f line less than 120 characters
	Added _lookAtPosition to RecordingFrame
2014-09-15 19:01:50 -07:00
Atlante45
9b87e31739 Fixed typo 2014-09-15 18:47:55 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement.
Also tweaked max walking speed.
2014-09-15 13:53:37 -07:00
Andrew Meadows
15025bf8d8 fix for flickering avatars 2014-09-08 13:08:08 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrew Meadows
7be411b4ca expose _measured_ MyAvatar velocity to JS 2014-09-05 11:44:13 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Atlante45
a1e6d9e7a1 Protections against null pointers 2014-09-02 12:56:12 -07:00
ZappoMan
0f2a14a359 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-09-02 07:52:51 -07:00
Atlante45
9b5b83117f CR 2014-08-29 14:25:05 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
Atlante45
a6bf9d7b90 Handle URL recordings + some safety checks 2014-08-28 11:42:39 -07:00
Atlante45
9df68dc2f1 CR 2014-08-28 10:58:07 -07:00
Atlante45
691ace7cc6 Looping option 2014-08-27 19:05:39 -07:00
Atlante45
465b076998 Removed debug + ignore frame 0 2014-08-26 18:19:26 -07:00
Atlante45
056cd0a4d1 extra line 2014-08-26 18:06:10 -07:00
Atlante45
41461cd322 Added option to playback from current location 2014-08-26 17:23:50 -07:00
Atlante45
dda02b5dcf Fake faceshift connection while playing back 2014-08-26 15:54:16 -07:00
Atlante45
3826ed0d69 Added setFinalPitch/Yaw/Roll to HeadData 2014-08-26 15:36:08 -07:00
Atlante45
9e686b4096 Moved lean and head rotation inside Player class 2014-08-26 14:36:46 -07:00
Atlante45
b92ae53753 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-26 14:34:39 -07:00
ZappoMan
ef8feec91a fix referentials corruption and removed some debugging 2014-08-26 10:42:46 -07:00
ZappoMan
74585bc593 fix bug in referentials 2014-08-26 10:14:28 -07:00
ZappoMan
4e38cb7c68 more debugging of referentials 2014-08-25 15:12:29 -07:00
Atlante45
f207abdd98 Move Player over to AvatarData for ACs to use 2014-08-21 15:24:19 -07:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Atlante45
52640c8482 Various tweaks and code cleanup 2014-08-18 14:23:29 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
ff0a5df2d6 Joint rotations manipulation helper 2014-08-12 16:12:34 -07:00
AndrewMeadows
e5c2a099b8 Merge pull request #3268 from birarda/take-out-the-trash
cmake (in)sanity
2014-08-11 09:15:38 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
c63e886444 don't look backwards for fbx header from avatars library 2014-08-08 13:17:53 -07:00
Stephen Birarda
93b6f167f5 change more CMakeLists to use simplified hifi library linker 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
Stephen Birarda
2bb37f2d64 more Qt module dependencies sorted out for libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
1059e9a635 add back more required Qt modules 2014-08-08 13:17:52 -07:00
Stephen Birarda
fa26957b23 more CMakeLists cleanup for sub-dependencies 2014-08-08 13:17:52 -07:00
Stephen Birarda
45afce48f7 remember old session UUID in AvatarHashMap to work around ghosting 2014-08-08 13:14:03 -07:00
Atlante45
fe8839b4b8 CR 2014-08-06 10:40:55 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00