Jeffrey Ventrella
5c7fd0fe7d
a few small formatting and glitch fixes
2013-05-06 11:29:18 -07:00
Jeffrey Ventrella
f8762c5e37
added avatar data file stuff that got lost during a merge or something
2013-05-03 16:58:52 -07:00
Jeffrey Ventrella
707d513dac
Merge remote-tracking branch 'upstream/master'
2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300
fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly.
2013-05-03 16:11:35 -07:00
Andrzej Kapolka
bc0c1cf5f9
Fixed bug with rendering stars on OS X: was using some weird extension on
...
Apple rather than standard VBOs.
2013-05-03 15:44:51 -07:00
Andrzej Kapolka
c1a3478954
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-03 15:44:14 -07:00
Jeffrey Ventrella
85ad5601d7
added avatar shadow
2013-05-03 15:22:01 -07:00
Stephen Birarda
bd3c902b68
remove logging of audio stats
2013-05-03 15:13:38 -07:00
Stephen Birarda
31e9c18346
couple of extra line deletions in main.cpp
2013-05-03 15:09:44 -07:00
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
Andrzej Kapolka
8923057d0e
Compile fix, need to use integer GL uniform.
2013-05-03 13:00:48 -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
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
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
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
b703d0982e
Changed avatar.h to store _distanceToNearestAvatar
2013-05-03 09:55:25 -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
Philip Rosedale
9716ea9550
Ground plane moved to 0->10 and lines are exactly 1 meter
2013-05-02 22:28:41 -07:00
ZappoMan
34a059db9a
more optimizations of render pipeline
2013-05-02 22:26:56 -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
ZappoMan
fcce4753c9
more optimizations on render pipeline
2013-05-02 16:37:31 -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
Andrzej Kapolka
762c635744
Restored constant value added another reference to the SDK docs.
2013-05-02 14:44:03 -07:00
Andrzej Kapolka
5de15dd5a4
Final bits for Oculus support. Works!
2013-05-02 14:39:00 -07:00
Jeffrey Ventrella
673936e141
adjusted proportions of avatar skeleton to make it closer to average human
2013-05-02 14:05:51 -07:00
ZappoMan
8f0dd1ffa1
added render pipeline warnings menu item
2013-05-02 13:17:06 -07:00
Jeffrey Ventrella
cd334c2ade
renamed avatar skeleton from "bones" to "joints" to be more consistent with standard language. Also improved skeleton some
2013-05-02 13:13:56 -07:00
Andrzej Kapolka
b0bbca281d
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-02 13:10:39 -07:00
Andrzej Kapolka
94f1e03eb1
More work on Oculus integration; added some notes to explain the source of the
...
magic numbers.
2013-05-02 13:02:11 -07:00
ZappoMan
e2481f514c
lower warning threshold to 1 millisecond for voxel render pipeline steps
2013-05-02 12:53:56 -07:00
ZappoMan
275772bb3d
debugging voxel sending behavior
2013-05-02 12:26:51 -07:00
