Andrzej Kapolka
45fb31cd08
Basic network simulation for metavoxels.
2014-10-20 18:43:41 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
samcake
a6b9fe34b5
Merge pull request #3606 from ZappoMan/groupMaterialsRendering
...
More Model::render() improvements
2014-10-16 14:42:37 -07:00
ZappoMan
d1f263ecc5
group materials together when rendering models
2014-10-16 14:05:35 -07:00
AndrewMeadows
e75d2a167a
Merge pull request #3602 from ZappoMan/frustumCullModelParts
...
More Model::render() improvements
2014-10-16 11:04:57 -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
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
ZappoMan
8c37181635
add menu item for enable/disable culling of model parts
2014-10-15 09:23:27 -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
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
Sam Gateau
153d3b532b
merged with upstream, all clear
2014-10-14 00:19:19 -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
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -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
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
Andrzej Kapolka
049a00b85b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-08 11:51:10 -07:00
Andrzej Kapolka
04b628bede
Added option to display Hermite data
2014-10-07 16:44:55 -07:00
Stephen Birarda
ea4c5a8900
repairs for new user scoped paths
2014-10-07 14:18:05 -07:00
Sam Gateau
bd5c6517a5
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
Conflicts:
interface/src/ui/MetavoxelEditor.cpp
interface/src/ui/overlays/Sphere3DOverlay.cpp
2014-10-03 17:31:05 -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
Stephen Birarda
ea0a1a4fb6
don't store domain hostname, leverage AddressManager only
2014-10-03 10:46:05 -07:00
Stephen Birarda
96aacab8ab
load Address from settings to get back to domain and path
2014-10-03 10:42:15 -07:00
Ryan Huffman
fe8909ff0e
Change reloadAllScripts shortcut
2014-10-02 16:26:32 -07:00
Philip Rosedale
8f40780af0
Merge pull request #3517 from ctrlaltdavid/20048
...
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
2014-09-30 21:06:45 -07:00
Stephen Birarda
f047c2dff0
have OS X hydra support be disabled by default
2014-09-29 17:08:06 -07:00
Stephen Birarda
f7a17b7dec
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
2014-09-29 12:58:01 -07:00
David Rowe
5c406a0e06
Add "Leap Motion on HMD" developer menu option
2014-09-28 17:18:46 -07:00
Atlante45
7d78584aee
Fix chat shortcut
2014-09-26 20:11:14 -07:00
stojce
5610cfeb34
CR fixes
2014-09-26 00:57:56 +02:00
stojce
6a3bc8f255
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
2014-09-25 23:57:19 +02:00
stojce
92cb17cbbe
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
...
Conflicts:
interface/src/Menu.h
2014-09-24 09:25:04 +02:00
Ryan Huffman
1ee01fdab3
Merge branch 'master' of github.com:highfidelity/hifi into 20024
2014-09-23 14:10:00 -07:00
Stephen Birarda
1007f528f0
Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations
2014-09-22 17:42:59 -07:00
Stephen Birarda
5be045d612
remove LocationManager and NamedLocation, replace with DataWebDialog
2014-09-22 16:55:44 -07:00
stojce
cc83c2b2e0
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
2014-09-22 20:52:17 +02:00
stojce
466dbdcee5
added address bar dialog
2014-09-22 20:51:19 +02:00
Stephen Birarda
e09eef98f2
add option to add javascript objects to a DataWebDialog
2014-09-18 17:17:33 -07:00
Andrzej Kapolka
c54e1c937c
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
...
Conflicts:
interface/src/avatar/Head.cpp
2014-09-18 13:08:55 -07:00
Philip Rosedale
929e463e40
Merge pull request #3447 from birarda/webkit-dialogs
...
add a DataWebDialog class to display auth'ed pages from data-web
2014-09-18 09:48:22 -07:00
Stephen Birarda
a0675162b6
hook My Locations to data-web dialog
2014-09-18 09:35:33 -07:00
Brad Hefta-Gaub
945b251f9b
Merge pull request #3446 from stojce/20037
...
Code Review for Job #20037
2014-09-18 09:05:29 -07:00
stojce
9a523a60cf
Add option to toggle on/off names above heads
2014-09-18 06:59:29 +02:00
Andrew Meadows
8359e672bb
merge upstream/master into andrew/ragdoll
2014-09-17 17:56:35 -07:00
Stephen Birarda
abafaffe44
fix a missed Model->Entity rename that caused slot error
2014-09-17 14:43:48 -07:00
Ryan Huffman
0efce7c8ee
Add hotkey to reload all scripts
2014-09-17 13:50:57 -07:00
Andrew Meadows
489871d0d6
added MyAvatar.setMotorVelocity() & friends for JS
2014-09-16 17:09:32 -07:00
Andrzej Kapolka
07efda89ef
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
2014-09-16 13:20:43 -07:00
