Commit graph

14992 commits

Author SHA1 Message Date
David Rowe
7f2d33c4e4 Add in model uploading via API 2014-08-07 15:31:44 -07:00
David Rowe
eaf0b366d0 Update model reading in preparation for API upload 2014-08-07 15:30:27 -07:00
David Rowe
70548976db Fix boundary string format to not include curly braces 2014-08-07 15:27:30 -07:00
David Rowe
83a868d741 Make XMLHttpRequest automatically authorize API calls 2014-08-07 15:20:30 -07:00
David Rowe
573ce7261b Add proper sending of ArrayBuffers via JavaScript XMLHttpRequest 2014-07-31 19:24:46 -07:00
David Rowe
0c589b73c4 Tidy model data handling 2014-07-30 22:12:11 -07:00
David Rowe
f39aed37b6 Recode and rescale texture file data before uploading
A recodeImage() method is added to the JavaScript ArrayBuffer object.
2014-07-29 17:26:42 -07:00
David Rowe
287e3d6800 Compress model and texture file data in multipart/form-data
A compress() method is added to the JavaScript ArrayBuffer object.
2014-07-29 13:52:52 -07:00
David Rowe
5a5bbfd612 Tidying 2014-07-29 09:46:54 -07:00
David Rowe
edf96b749e Add texture files to multipart/form-data 2014-07-28 23:01:12 -07:00
David Rowe
00abf43fae Add LOD files to multipart/form-data 2014-07-28 22:10:25 -07:00
David Rowe
c7c2f31192 Fix display of scale read from model file 2014-07-28 21:59:44 -07:00
David Rowe
0bb42ba5f2 Fix call stack overflow when preparing large multipart/form-data 2014-07-28 21:55:05 -07:00
David Rowe
ccf37c6c17 Fix text displayed on Window.form() directory button 2014-07-28 21:53:00 -07:00
David Rowe
63d7ff0bde Tidying 2014-07-28 20:00:23 -07:00
David Rowe
f46c064e88 Speed up model reading 2014-07-28 19:58:53 -07:00
David Rowe
61bb21cc00 Prepare multipart/form-date message with model file and attributes 2014-07-27 22:05:18 -07:00
David Rowe
f602f42189 Add Cancel button to model editing dialog 2014-07-26 09:22:44 -07:00
David Rowe
fcfaf6a9be Add Set Model Properties dialog for model uploading 2014-07-26 08:49:42 -07:00
David Rowe
49e0d07ac8 Add directory picker button option to JavaScript Window.form() 2014-07-25 20:32:44 -07:00
David Rowe
eecdc2dc7b Increase initial width of the edit fields in JavaScript Window.form() 2014-07-24 19:00:41 -07:00
David Rowe
040254a119 Add optional Cancel button to JavaScript Window.form() 2014-07-24 17:04:02 -07:00
David Rowe
7c6f1ff414 Handle FBX file name not found in FST file more gracefully 2014-07-23 17:09:40 -07:00
David Rowe
401326ddd7 Fix FST file processing after ArrayBuffer change 2014-07-23 16:59:52 -07:00
David Rowe
6b72274d21 Read author and texture filenames from text FBX files 2014-07-23 16:05:34 -07:00
David Rowe
ec8b82bf6e Read author and texture filenames from binary FBX files 2014-07-23 12:27:52 -07:00
David Rowe
ed7bd9317e Make XMLHttpRequest return an ArrayBuffer object when requested 2014-07-22 21:48:48 -07:00
David Rowe
09d52251ef Fix merge 2014-07-22 20:38:44 -07:00
David Rowe
ffb696dc53 Merge branch 'make_scriptEngine_a_qScriptEngine' of https://github.com/Atlante45/hifi into 19840 2014-07-22 20:21:19 -07:00
David Rowe
04ddc92de1 Merge branch 'master' into 19840 2014-07-22 20:09:05 -07:00
Philip Rosedale
9cee549bf0 Merge pull request #3198 from ey6es/master
Multiply local light colors by material diffuse reflectance.
2014-07-22 21:54:22 -04:00
Andrzej Kapolka
02bf76240a Multiply local light colors by material diffuse reflectance. 2014-07-22 18:30:28 -07:00
Andrzej Kapolka
34dfbbedde Merge pull request #3196 from PhilipRosedale/master
Tweaks to world and avatar lights, add angular acceleration to hair
2014-07-22 18:16:20 -07:00
Philip Rosedale
0b1c16d453 Merge pull request #3197 from ey6es/master
Not sure if everyone sees this or it's just my machine, but the frame rate slowed dramatically using the fixed function state for lights.  This switches back to using uniforms.
2014-07-22 21:13:57 -04:00
Andrzej Kapolka
4f87524821 Switched back to using uniforms for light parameters, as using the fixed
function state killed my frame rate.  Also cleaned up some of the location
tracking.
2014-07-22 18:03:13 -07:00
Philip Rosedale
4f52098da1 tuning tweaks to world and avatar lights 2014-07-22 20:23:23 -04:00
Philip Rosedale
176473b5ba Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 19:29:42 -04:00
AndrewMeadows
07ce6c9a64 Merge pull request #3192 from ey6es/master
Fixes for local lights.
2014-07-22 16:24:17 -07:00
Stephen Birarda
4b690f9394 Merge pull request #3195 from birarda/master
repair for Visage find module base includes
2014-07-22 15:57:33 -07:00
Stephen Birarda
56efa46812 repair for Visage find module base includes 2014-07-22 15:56:22 -07:00
Andrzej Kapolka
d4904f976a Missed the local light stats. 2014-07-22 15:50:08 -07:00
Andrzej Kapolka
aa145c8d20 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 15:40:42 -07:00
Stephen Birarda
7fb1391cc4 Merge pull request #3194 from birarda/master
fix faceshift definition
2014-07-22 14:49:07 -07:00
Stephen Birarda
5c955ca656 fix faceshift definition 2014-07-22 14:48:51 -07:00
Andrzej Kapolka
c085d09835 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 14:48:18 -07:00
Leonardo Murillo
82b6e7f784 Merge pull request #3193 from birarda/master
repairs to stubbed faceshft constructor
2014-07-22 15:42:18 -06:00
Stephen Birarda
19618182a3 don't show Faceshift option if not present 2014-07-22 14:40:53 -07:00
Stephen Birarda
f325500d14 repairs to stubbed faceshft constructor 2014-07-22 14:38:41 -07:00
Andrzej Kapolka
7faf64c54a Tab fixes. 2014-07-22 14:24:25 -07:00
Leonardo Murillo
6f0f6488d5 Merge pull request #3182 from birarda/select-library
dynamic selection of debug and release libraries for externals
2014-07-22 15:17:48 -06:00