Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 03:48:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17935 commits 25 branches 0 tags 1.1 GiB
Commit graph

9263 commits

Author SHA1 Message Date
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
ZappoMan
3a6715c0bc improve timing stats display 2014-10-15 14:00:56 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
ZappoMan
eab96587fe add stats for entity rendering details 2014-10-15 09:24:58 -07:00
ZappoMan
da4c179a9f correctly track rendered entities 2014-10-15 09:23:59 -07:00
ZappoMan
8c37181635 add menu item for enable/disable culling of model parts 2014-10-15 09:23:27 -07:00
Andrzej Kapolka
3006950b83 Comment fix. 2014-10-14 18:24:44 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -07:00
Andrzej Kapolka
394bf2b4ee Basic sculpt tool, refactored common material bits in tools. 2014-10-14 14:37:32 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Andrzej Kapolka
ff368f9848 Merge pull request #3592 from samcake/temp0 
Rendering resolution can be different than the native window resolution
 2014-10-14 11:56:50 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
5f67194564 fix member variable order in Joystick class 2014-10-14 11:39:28 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
David Rowe
a619d0460d Show chat alerts in icon tray only if not already seen 2014-10-14 11:08:24 -07:00
David Rowe
5151563b79 Coding standard 2014-10-14 11:08:02 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
AndrewMeadows
2a35c4af4d Merge pull request #3593 from huffman/20024 
CR for Job #20024 - UI edits to Running Scripts dialog
 2014-10-14 09:52:13 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
Andrzej Kapolka
00490af837 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 17:59:35 -07:00
Clément Brisset
87d067c8f0 Merge pull request #3590 from ctrlaltdavid/extra-logging 
Minor logging improvements
 2014-10-13 16:20:43 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
Clément Brisset
9d050782cc Merge pull request #3586 from ctrlaltdavid/20093 
CR for Job #20093 - Add a menu item corresponding to the apostrophe key (reset sensors)
 2014-10-13 16:14:04 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
13efaba22c Basic metavoxels example. 2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -07:00
David Rowe
bd9451d4c6 Log Oculus SDK version used in build 2014-10-13 13:20:24 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
AndrewMeadows
3d888b6c27 Merge pull request #3584 from huffman/sdl-update 
Update to SDL2
 2014-10-13 09:37:16 -07:00
Philip Rosedale
99e596ae7e really remove file 2014-10-13 17:35:00 +01:00
Philip Rosedale
c4000eb468 fix windows error 2014-10-13 17:33:01 +01:00
David Rowe
c6bf09f509 Fix model uploading for the case that haven't uploaded model before 2014-10-13 08:35:52 -07:00
Philip Rosedale
18979adf23 remove startup debug from buckyballs 2014-10-12 20:42:53 -07:00
Philip Rosedale
e5f93d00ac remove unused utility functions 2014-10-12 20:42:15 -07:00
Philip Rosedale
dc09572776 remove unused functions 2014-10-12 20:17:20 -07:00
Philip Rosedale
bc6346c257 Removed unused constant, class 2014-10-12 20:14:51 -07:00
Philip Rosedale
a054408abb Merge branch 'master' of https://github.com/worklist/hifi 2014-10-12 17:04:37 -07:00
ZappoMan
a08ddecc3a fix shifting tickmarks 2014-10-10 22:06:12 -07:00
Ryan Huffman
42479b1ae2 Add joystickWithName for PrioVR 2014-10-10 18:03:08 -07:00
Andrzej Kapolka
d1c6aef953 Fixed my swizzle! 2014-10-10 17:36:21 -07:00
Ryan Huffman
a24b5c24a9 Update max axis value to reflect maximum negative value 2014-10-10 17:28:09 -07:00
Andrzej Kapolka
1f63656a14 Comment fix. 2014-10-10 17:25:25 -07:00
Andrzej Kapolka
dc8dc112c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 17:19:24 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Ryan Huffman
762cc71d31 Update to SDL2 2014-10-10 17:03:10 -07:00
Andrzej Kapolka
1911cfd0be Basic ray/voxel intersection testing up and running. 2014-10-10 15:11:37 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
edf8cb671d Add "reset sensors" menu item corresponding to the apostrophe key 2014-10-10 13:24:48 -07:00
Andrzej Kapolka
c8c09a1e7b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 13:02:10 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
David Rowe
357d49d442 Fix building without Oculus library 2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c Tidy up log messages 2014-10-10 11:08:15 -07:00
David Rowe
0a5fdee1f2 Use NULL rather than 0 for "no overlay" 2014-10-10 11:00:41 -07:00
David Rowe
aa37ba5dfd Use const parameters 2014-10-10 10:57:17 -07:00
David Rowe
64d9a96a2b Update SVG file location 2014-10-10 10:42:13 -07:00
Stephen Birarda
76d00f351d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 09:28:14 -07:00
AndrewMeadows
2a8b002725 Merge pull request #3576 from ZappoMan/editToolsImprovements 
First cut at new rotation UI/UX
 2014-10-10 08:17:22 -07:00
Brad Hefta-Gaub
961590414c Merge pull request #3574 from PhilipRosedale/master 
Oculus fixed for 3rd person and fullscreen mirror view
 2014-10-09 21:30:18 -07:00
ZappoMan
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -07:00
Andrzej Kapolka
7b0d002355 Working on ray/voxel intersection testing. 2014-10-09 19:51:02 -07:00
ZappoMan
e5572e9deb don't render if alpha is 0 2014-10-09 19:20:33 -07:00
Andrzej Kapolka
51ff4cf7bb Merge pull request #3567 from samcake/master 
Improve the TextRenderer::draw(), step 1
 2014-10-09 18:46:23 -07:00
Sam Gateau
6687660d2f Fixing Andrzej's comments bis 2014-10-09 17:29:06 -07:00
Sam Gateau
1fc78e4277 Fixing Andrzej's comments 2014-10-09 17:18:51 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Sam Gateau
86c20b26eb Adding proper TODO and comments 2014-10-09 12:20:46 -07:00
Sam Gateau
d080d6347b Fixing const usage on a template function 2014-10-09 11:10:04 -07:00
Sam Gateau
b0c02311c0 Fixing include filename case 2014-10-09 10:56:41 -07:00
Sam Gateau
adc4e8c513 Fixing unix file format issues with msdev2010 2014-10-09 10:39:28 -07:00
samcake
9f0936de53 Improve the TextRenderer::draw(), first step 
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to    use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
  It's in the new file gpu/Resource.h(.cpp)

- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.

THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
 2014-10-09 10:17:50 -07:00
ZappoMan
2004159778 implement basic support for planar overlay type intersections 2014-10-08 20:29:53 -07:00
Brad Hefta-Gaub
c9c3ab985a Merge pull request #3565 from PhilipRosedale/master 
Simplify camera class to have no interpolation, simpler structure
 2014-10-08 17:06:21 -07:00
Brad Hefta-Gaub
80e82c95ca Merge pull request #3560 from birarda/xbox-controller 
allow a call to Joysticks.reset to reset SDL while interface is running
 2014-10-08 17:06:12 -07:00
Brad Hefta-Gaub
a673634245 Merge pull request #3559 from stojce/20084 
CR for Job #20084 - Microsoft Windows - Chat window font needs to be fixed (see attached)
 2014-10-08 17:05:40 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
Andrzej Kapolka
19ec68309b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 15:22:17 -07:00
Andrzej Kapolka
37eff685bc Remove the "render lower detail as points" option. It doesn't seem too 
promising.
 2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387 Provide the option to display lower detail metavoxel data as points. 2014-10-08 14:05:14 -07:00
Stephen Birarda
ce505c1b0c add a missing HAVE_SDL wrap on setter in Joystick 2014-10-08 12:09:40 -07:00
Clément Brisset
e4f5f11429 Merge pull request #3557 from birarda/master 
fix for window modalities
 2014-10-08 11:53:48 -07:00
David Rowe
05915ae134 Make calibration message update its location more often 2014-10-08 11:53:07 -07:00
Andrzej Kapolka
049a00b85b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 11:51:10 -07:00
Stephen Birarda
8e2d41f37f remove deadzone handling from Joystick class 2014-10-08 11:41:07 -07:00
AndrewMeadows
4873528068 Merge pull request #3543 from birarda/domain-tunnel 
handle local socket changes when moving networks for auto networked domains
 2014-10-08 11:36:56 -07:00
Stephen Birarda
17b9f4a37d allow a call to Joysticks.reset to reset SDL while interface is running 2014-10-08 11:34:45 -07:00
Philip Rosedale
12349a8854 Fix rearview mirror camera 2014-10-08 10:59:46 -07:00