AndrewMeadows
e75d2a167a
Merge pull request #3602 from ZappoMan/frustumCullModelParts
...
More Model::render() improvements
2014-10-16 11:04:57 -07:00
Brad Hefta-Gaub
866b3d40fc
Merge pull request #3604 from AndrewMeadows/inertia
...
experimental hair tuning
2014-10-16 10:53:31 -07:00
AndrewMeadows
4fbc589606
Merge pull request #3598 from birarda/domain-tunnel
...
initial pass at using keypairs for username verification for basic domain-server ACL
2014-10-16 10:49:03 -07:00
Andrew Meadows
8b54569480
experimental hair tuning submitted by Ryan
2014-10-16 10:20:12 -07:00
ZappoMan
ffb7bcf9d3
wire up different culling options to debug menus
2014-10-16 09:32:24 -07:00
ZappoMan
d238d06df5
build a cached lookup table for the shouldRenderMesh() LOD method
2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc
add support for LOD occulsion for too small meshes in Model::render()
2014-10-16 00:30:24 -07:00
Brad Hefta-Gaub
8ee26923da
Merge pull request #3600 from birarda/master
...
some dead code removal
2014-10-15 20:23:59 -07:00
ZappoMan
4c7ecba579
spelling change
2014-10-15 20:23:04 -07:00
ZappoMan
921a3fb8c0
switch QList<> to QVector<> and add some guards against out of range indices
2014-10-15 20:18:04 -07:00
samcake
01b64d78e3
Merge pull request #3601 from ZappoMan/frustumCullModelParts
...
Implement "segregation" of mesh groups
2014-10-15 18:09:48 -07:00
ZappoMan
56b4d58f18
implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group
2014-10-15 17:08:47 -07:00
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
ZappoMan
8a83511942
first cut at separating opaque from transparent meshes
2014-10-15 14:40:42 -07:00
ZappoMan
c8db8855cc
move tallyAllTimerRecords out of conditional so they don't pile up
2014-10-15 14:23:29 -07:00
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
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
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
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
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
