Stephen Birarda
da93b596de
some deletion cleanup in main.cpp
2013-05-03 15:08:48 -07:00
Stephen Birarda
1a8564f9d9
store avatar position and yaw in file to restore on relaunch
2013-05-03 15:05:28 -07:00
Stephen Birarda
90a08b4dd8
cleanup in Audio and Util
2013-05-03 14:45:47 -07:00
birarda
4f74e5a6e2
Merge pull request #192 from birarda/pairing
...
include cstring for use of strlen
2013-05-03 14:42:33 -07:00
Stephen Birarda
82db78cc67
include cstring for use of strlen
2013-05-03 14:41:56 -07:00
birarda
f5bbc981c1
Merge pull request #191 from birarda/pairing
...
add missing header for sscanf and printf
2013-05-03 13:01:41 -07:00
Stephen Birarda
2ab7bc0d8a
add cstdio for sscanf and printf
2013-05-03 13:01:02 -07:00
birarda
af44e42d74
Merge pull request #190 from birarda/pairing
...
fix port on pairing server
2013-05-03 12:35:14 -07:00
Stephen Birarda
597c8336bd
change the pairing server listen port to 7247
2013-05-03 12:34:29 -07:00
ZappoMan
8e7dd4ba8f
Merge pull request #187 from ey6es/master
...
Fix for Oculus rendering: we need to resize the render texture when the display is resized.
2013-05-03 12:24:54 -07:00
ZappoMan
f78c59f828
Merge pull request #189 from birarda/pairing
...
basic version of the pairing server
2013-05-03 12:24:29 -07:00
Stephen Birarda
d0444ee5b7
accept a local address and port from requestor
2013-05-03 12:22:20 -07:00
Jeffrey Ventrella
1fc74b3556
Merge pull request #188 from Ventrella/master
...
I have a bunch of things to pull.
2013-05-03 11:18:55 -07:00
Jeffrey Ventrella
8457b91fe0
cleaned up a bunch of leftover tabs and converted each to 4 spaces
2013-05-03 11:15:49 -07:00
Stephen Birarda
5f26d44fd8
Merge remote-tracking branch 'upstream/master' into pairing
2013-05-03 10:59:34 -07:00
Stephen Birarda
bd6f0d9885
couple of line deletions
2013-05-03 10:58:57 -07:00
Andrzej Kapolka
9dfc6c6590
Fix for fullscreen mode switching: when we reshape, we need to resize the
...
render texture (if it exists).
2013-05-03 10:57:51 -07:00
Jeffrey Ventrella
026ee4345c
Merge remote-tracking branch 'upstream/master'
2013-05-03 10:54:07 -07:00
Jeffrey Ventrella
e0b33e56da
couple of small code cleanups
2013-05-03 10:52:44 -07:00
Philip Rosedale
cff1d73496
Merge pull request #182 from ey6es/master
...
Support for rendering to Oculus rift.
2013-05-03 10:39:04 -07:00
Andrzej Kapolka
346f213e3b
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/main.cpp
2013-05-03 10:31:40 -07:00
Philip Rosedale
f05451b4f1
Merge pull request #186 from ZappoMan/render_voxels_optimization
...
Some more tweaks to test pipeline
2013-05-03 10:27:56 -07:00
Philip Rosedale
5dfa1258de
Merge pull request #181 from Ventrella/master
...
renamed avatar "bones" to "joints", and improved skeleton
2013-05-03 10:25:46 -07:00
Andrzej Kapolka
08350a5d3a
Rather than a command line parameter, provide a menu option for switching
...
to/from fullscreen mode.
2013-05-03 10:22:10 -07:00
Philip Rosedale
1fbc13941d
Fixes per merge (Ventrella)
2013-05-03 10:16:58 -07:00
Andrzej Kapolka
43b5e9430f
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-03 10:04:50 -07:00
ZappoMan
5710dd750d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-03 10:01:37 -07:00
ZappoMan
a4f2dc283d
various changes to help debug render pipeline
...
- fixing some cases where TREE_SCALE was not using constant in prep for making TREE_SCALE larger
- added createLine() to VoxelTree
- added axis lines made of voxels to scene
- added corner points made of voxels to scene
2013-05-03 09:58:52 -07:00
Philip Rosedale
f37923f906
Merge pull request #185 from PhilipRosedale/master
...
Improvement to other avatar detection to help jeffrey's merge
2013-05-03 09:57:59 -07:00
Philip Rosedale
b703d0982e
Changed avatar.h to store _distanceToNearestAvatar
2013-05-03 09:55:25 -07:00
Philip Rosedale
33b9534e7f
Merge pull request #183 from ZappoMan/render_voxels_optimization
...
Render voxels optimization
2013-05-02 22:42:20 -07:00
ZappoMan
d7e34d25bf
small tweak to corner boxes
2013-05-02 22:38:58 -07:00
ZappoMan
2b11cad1ab
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-02 22:33:41 -07:00
ZappoMan
bf6229b842
Merge pull request #184 from PhilipRosedale/master
...
Moved ground plane, 1 meter spacing
2013-05-02 22:31:06 -07:00
Philip Rosedale
9716ea9550
Ground plane moved to 0->10 and lines are exactly 1 meter
2013-05-02 22:28:41 -07:00
ZappoMan
ac879f5809
added corner voxels to scene
2013-05-02 22:27:33 -07:00
ZappoMan
34a059db9a
more optimizations of render pipeline
2013-05-02 22:26:56 -07:00
Philip Rosedale
1973ebbb9c
Merge pull request #179 from PhilipRosedale/master
...
Improved stats display (Mbps), enumerated transmitter devices, avatars slow down around people
2013-05-02 20:52:14 -07:00
Philip Rosedale
581365f1f1
Fixes per code review.
2013-05-02 20:51:17 -07:00
Philip Rosedale
2195a140fd
Merge remote-tracking branch 'upstream/master'
2013-05-02 20:36:43 -07:00
ZappoMan
771c604121
more render pipeline optimizations
2013-05-02 18:12:55 -07:00
Jeffrey Ventrella
7a52d51251
adding avatar renderer
2013-05-02 17:47:28 -07:00
Jeffrey Ventrella
c46fc5a861
(1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4)
2013-05-02 17:46:10 -07:00
Stephen Birarda
dea2038200
send the address and socket of device requesting pair to last available
2013-05-02 17:00:39 -07:00
ZappoMan
fcce4753c9
more optimizations on render pipeline
2013-05-02 16:37:31 -07:00
Stephen Birarda
e5cd66313a
check the number of sscanf matches, store sending socket for device to reply
2013-05-02 16:28:19 -07:00
Stephen Birarda
9050642390
add pairing device to vector after creation
2013-05-02 16:11:34 -07:00
ZappoMan
5a14c71225
added dirty bit support to VoxelTree, use it to determine when to call treeToArrays
2013-05-02 15:57:31 -07:00
Andrzej Kapolka
8e2c43e983
Need to disable blending when we render the distorted screen quad.
2013-05-02 15:54:58 -07:00
Andrzej Kapolka
ccded56ecf
Use the right type here; Xcode complains about it.
2013-05-02 15:20:29 -07:00
