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
Philip Rosedale
2da4345b21
First person and mirror HMD view almost fixed
2014-10-09 13:32:35 -07:00
Philip Rosedale
cdd60dead2
Merge branch 'master' of https://github.com/worklist/hifi
2014-10-08 15:28:56 -07:00
Philip Rosedale
01bef6be6d
remove unused cameraPushback variable
2014-10-08 15:28:29 -07:00
Philip Rosedale
12349a8854
Fix rearview mirror camera
2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b
Fix full screen mirror keyboard controls
2014-10-08 10:51:06 -07:00
Philip Rosedale
2636fdd3cb
Fix third person camera distance
2014-10-08 10:23:45 -07:00
Philip Rosedale
c4c9f4820d
First pass at simplifying camera, removes interpolation to target and setbacks
2014-10-08 10:00:47 -07:00
Philip Rosedale
f4b9ccbceb
remove unused camera functions
2014-10-07 21:51:46 -07:00
Stephen Birarda
f19c5c9850
repair NetworkAccessManager returns, handle custom AS port in assignment-client
2014-10-06 14:57:38 -07:00
Sam Gateau
4f26c9e0fa
fix formatting and syntax issues
2014-10-06 11:06:23 -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
Stephen Birarda
5203113b41
separate ICE ID and domain ID for reconnections to moved domains
2014-10-03 17:01:33 -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
52ec949aac
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-03 11:26:23 -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
Stephen Birarda
f27105100a
have AddressManager know its current domain and current path
2014-10-03 10:29:02 -07:00
ZappoMan
175e5d5f79
add ray picking to 3D overlays
2014-10-02 20:44:49 -07:00
Stephen Birarda
262054d0eb
handle ICE requirement in address manager response
2014-10-02 14:18:17 -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
David Rowe
673afca11b
Update camera object's position and orientation with actual Rift values
2014-09-30 10:05:59 -07:00
Stephen Birarda
3c236cc60a
resolve conflicts on merge with upstream master
2014-09-29 16:00:50 -07:00
David Rowe
1bffaa262d
Reference camera object rather than copy it
2014-09-29 15:46:22 -07:00
Stephen Birarda
a847c2d80d
move url handling to after settings load debug
2014-09-29 13:15:28 -07:00
Stephen Birarda
3fbf141686
handle avatar location changes after avatar position has been reloaded
2014-09-29 13:14:25 -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
Stephen Birarda
eb7ee36168
use two dashes for url as command line option
2014-09-29 10:29:40 -07:00
Stephen Birarda
7c738edbd8
Merge pull request #3488 from PhilipRosedale/master
...
Correct eye contact for Oculus users
2014-09-26 15:42:03 -07:00
Stephen Birarda
5b2b0c47c0
Merge pull request #3483 from stojce/20061
...
Code Review for Job #20061
2014-09-26 14:24:44 -07:00
AndrewMeadows
7f7861671e
Merge pull request #3471 from ctrlaltdavid/20055
...
Code Review for Job #20055
2014-09-26 14:00:33 -07:00
David Rowe
aa9511c263
Position Rift camera at avatar model's mid-eye location
2014-09-25 22:49:12 -07:00
Philip Rosedale
1d4b86d85b
Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus
2014-09-25 16:00:56 -07:00
stojce
6a3bc8f255
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
2014-09-25 23:57:19 +02:00
Philip Rosedale
693bc11868
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85
Add world space eye locations (for making eye contact) to the oculus manager
2014-09-25 11:58:41 -07:00
AndrewMeadows
697c7f6a61
Merge pull request #3481 from ZappoMan/collidingEntities
...
First cut at colliding entities
2014-09-25 09:38:50 -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
Brad Hefta-Gaub
712f88baa3
Merge pull request #3476 from birarda/xbox-controller
...
add script support for general SDL controllers
2014-09-25 09:25:08 -07:00
ZappoMan
f43ba4a68b
first cut at getting entities to collide
2014-09-24 15:28:04 -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
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
Stephen Birarda
13d3eb02e3
report the 360 axis values in xbox.js
2014-09-23 17:19:57 -07:00
Stephen Birarda
00b0806c4d
move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick
2014-09-23 17:09:46 -07:00
stojce
8031454f61
use backslash to activate chat
2014-09-24 00:22:51 +02:00
Philip Rosedale
729d3cf9bc
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-23 12:50:52 -07:00
Philip Rosedale
21a15cff2a
Avatar can look at corrected position when looking at me
2014-09-23 12:50:47 -07:00
Brad Hefta-Gaub
b7245f8259
Merge pull request #3469 from ctrlaltdavid/20054
...
Code Review for Job #20054
2014-09-23 09:57:31 -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
